summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--bootstraptest/runner.rb12
2 files changed, 10 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 516d79b..81f30b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-Sun May 11 22:39:33 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun May 11 22:54:02 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * bootstraptest/runner.rb (main): leave -I options for purelib.rb
+ untouched.
* bootstraptest/runner.rb (main): handle relative path -r options.
diff --git a/bootstraptest/runner.rb b/bootstraptest/runner.rb
index 07d6efc..5eea6b6 100644
--- a/bootstraptest/runner.rb
+++ b/bootstraptest/runner.rb
@@ -52,7 +52,7 @@ def main
when /\A--ruby=(.*)/
@ruby = $1
@ruby.gsub!(/^([^ ]*)/){File.expand_path($1)}
- @ruby.gsub!(/(\s+-I\s*)(\S+)/){$1+File.expand_path($2)}
+ @ruby.gsub!(/(\s+-I\s*)((?!(?:\.\/)*-(?:\s|\z))\S+)/){$1+File.expand_path($2)}
@ruby.gsub!(/(\s+-r\s*)(\.\.?\/\S+)/){$1+File.expand_path($2)}
true
when /\A--sets=(.*)/
@@ -80,14 +80,14 @@ Usage: #{File.basename($0, '.*')} --ruby=PATH [--sets=NAME,NAME,...]
-q, --quiet Don\'t print header message.
-h, --help Print this message and quit.
End
- exit 0
+ exit true
else
false
end
}
if tests and not ARGV.empty?
$stderr.puts "--tests and arguments are exclusive"
- exit 1
+ exit false
end
tests ||= ARGV
tests = Dir.glob("#{File.dirname($0)}/test_*.rb") if tests.empty?
@@ -97,7 +97,7 @@ End
puts Time.now
patchlevel = defined?(RUBY_PATCHLEVEL) ? " patchlevel #{RUBY_PATCHLEVEL}" : ''
puts "Driver is ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}#{patchlevel}) [#{RUBY_PLATFORM}]"
- puts "Target is #{`#{@ruby} -v`}"
+ puts "Target is #{`#{@ruby} -v`.chomp}"
puts
$stdout.flush
end
@@ -119,13 +119,13 @@ def exec_test(pathes)
$stderr.puts
if @error == 0
$stderr.puts "PASS #{@count} tests"
- exit 0
+ exit true
else
@errbuf.each do |msg|
$stderr.puts msg
end
$stderr.puts "FAIL #{@error}/#{@count} tests failed"
- exit 1
+ exit false
end
end