diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-15 16:33:15 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-15 16:33:15 +0000 |
commit | 820c20f9d02b6e53389577d66c82b2e5ce6f50a8 (patch) | |
tree | 0666bda56ad05e63a752e343ecf2a26c9b8c2efb /rubytest.rb | |
parent | 661907c72619210158cce755047e6378f20b4c4f (diff) | |
download | ruby-820c20f9d02b6e53389577d66c82b2e5ce6f50a8.tar.gz ruby-820c20f9d02b6e53389577d66c82b2e5ce6f50a8.tar.xz ruby-820c20f9d02b6e53389577d66c82b2e5ce6f50a8.zip |
merges r21405 from trunk into ruby_1_9_1.
* common.mk (test-sample), rubytest.rb: use runruby.rb
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21577 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'rubytest.rb')
-rwxr-xr-x | rubytest.rb | 33 |
1 files changed, 6 insertions, 27 deletions
diff --git a/rubytest.rb b/rubytest.rb index 6c3939a0a..ef23d64b5 100755 --- a/rubytest.rb +++ b/rubytest.rb @@ -1,43 +1,22 @@ #! ./miniruby exit if defined?(CROSS_COMPILING) -load './rbconfig.rb' -include RbConfig - -ruby = "./#{CONFIG['ruby_install_name']}#{CONFIG['EXEEXT']}" +ruby = ENV["RUBY"] +unless ruby + load './rbconfig.rb' + ruby = "./#{RbConfig::CONFIG['ruby_install_name']}#{RbConfig::CONFIG['EXEEXT']}" +end unless File.exist? ruby print "#{ruby} is not found.\n" print "Try `make' first, then `make test', please.\n" exit false end -if File.exist? CONFIG['LIBRUBY_SO'] - case RUBY_PLATFORM - when /-hpux/ - dldpath = "SHLIB_PATH" - when /-aix/ - dldpath = "LIBPATH" - when /-beos/ - dldpath = "LIBRARY_PATH" - when /-darwin/ - dldpath = "DYLD_LIBRARY_PATH" - else - dldpath = "LD_LIBRARY_PATH" - end - x = ENV[dldpath] - x = x ? ".:"+x : "." - ENV[dldpath] = x -end - -if /linux/ =~ RUBY_PLATFORM and File.exist? CONFIG['LIBRUBY_SO'] - ENV["LD_PRELOAD"] = "./#{CONFIG['LIBRUBY_SO']}" -end - $stderr.reopen($stdout) error = '' srcdir = File.dirname(__FILE__) -`#{ruby} -I.ext/#{RUBY_PLATFORM} -I#{srcdir}/lib #{srcdir}/sample/test.rb`.each_line do |line| +`#{ruby} #{srcdir}/sample/test.rb`.each_line do |line| if line =~ /^end of test/ print "\ntest succeeded\n" exit true |