summaryrefslogtreecommitdiff
path: root/bootstraptest/runner.rb
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-11 13:54:04 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-11 13:54:04 +0000
commit589a164abcd9ee6117c3e0af065f426a1659ef75 (patch)
treeee2d36ea3a42feb94aa30dd46f8966d5b287f30c /bootstraptest/runner.rb
parentb7a1480540d401704f12132b52f04aea6fdf42c3 (diff)
* bootstraptest/runner.rb (main): leave -I options for purelib.rb
untouched. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16364 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'bootstraptest/runner.rb')
-rw-r--r--bootstraptest/runner.rb12
1 files changed, 6 insertions, 6 deletions
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