ruby-changes:4871
From: ko1@a...
Date: Sun, 11 May 2008 22:54:21 +0900 (JST)
Subject: [ruby-changes:4871] nobu - Ruby:r16364 (trunk): * bootstraptest/runner.rb (main): leave -I options for purelib.rb
nobu 2008-05-11 22:54:04 +0900 (Sun, 11 May 2008) New Revision: 16364 Modified files: trunk/ChangeLog trunk/bootstraptest/runner.rb Log: * bootstraptest/runner.rb (main): leave -I options for purelib.rb untouched. http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=16364&r2=16363&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/bootstraptest/runner.rb?r1=16364&r2=16363&diff_format=u Index: ChangeLog =================================================================== --- ChangeLog (revision 16363) +++ ChangeLog (revision 16364) @@ -1,5 +1,8 @@ -Sun May 11 22:39:33 2008 Nobuyoshi Nakada <nobu@r...> +Sun May 11 22:54:02 2008 Nobuyoshi Nakada <nobu@r...> + * bootstraptest/runner.rb (main): leave -I options for purelib.rb + untouched. + * bootstraptest/runner.rb (main): handle relative path -r options. Sun May 11 19:04:06 2008 Yusuke Endoh <mame@t...> Index: bootstraptest/runner.rb =================================================================== --- bootstraptest/runner.rb (revision 16363) +++ bootstraptest/runner.rb (revision 16364) @@ -52,7 +52,7 @@ 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 @@ -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 @@ 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 @@ $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 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/