merges r21405 from trunk into ruby_1_9_1.

* common.mk (test-sample), rubytest.rb: use runruby.rb

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21577 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 11 insertions, 28 deletions

diff --git a/ChangeLog b/ChangeLog
index 6cd7449faa..9418e47152 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 16 01:09:37 2009  Koichi Sasada  <ko1@atdot.net>
 
 	* ruby.c (process_options): decrement parse_in_eval to recognize
diff --git a/common.mk b/common.mk
index 6598a44431..523f77b3d2 100644
--- a/common.mk
+++ b/common.mk
@@ -370,7 +370,7 @@ btest-ruby: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) PHONY
 	@$(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) -I$(srcdir)/lib" -q $(OPTS)
 
 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