diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | common.mk | 2 | ||||
-rwxr-xr-x | rubytest.rb | 33 |
3 files changed, 11 insertions, 28 deletions
@@ -1,3 +1,7 @@ +Fri Jan 9 12:29:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * common.mk (test-sample), rubytest.rb: use runruby.rb + Fri Jan 9 10:40:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * test/ruby/test_process.rb (TestProcess::MANDATORY_ENVS): some @@ -380,7 +380,7 @@ btest-ruby: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) PHONY @$(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) -I$(srcdir)/lib" -q test-sample: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) PHONY - @$(MINIRUBY) $(srcdir)/rubytest.rb + @$(RUNRUBY) $(srcdir)/rubytest.rb test-knownbug: miniruby$(EXEEXT) $(PROGRAM) $(RBCONFIG) PHONY $(MINIRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM)" $(OPTS) $(srcdir)/KNOWNBUGS.rb diff --git a/rubytest.rb b/rubytest.rb index 6c3939a0ac..ef23d64b54 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 |