ruby-changes:10033
From: yugui <ko1@a...>
Date: Fri, 16 Jan 2009 01:34:14 +0900 (JST)
Subject: [ruby-changes:10033] Ruby:r21577 (ruby_1_9_1): merges r21405 from trunk into ruby_1_9_1.
yugui 2009-01-16 01:33:15 +0900 (Fri, 16 Jan 2009) New Revision: 21577 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21577 Log: merges r21405 from trunk into ruby_1_9_1. * common.mk (test-sample), rubytest.rb: use runruby.rb Modified files: branches/ruby_1_9_1/ChangeLog branches/ruby_1_9_1/common.mk branches/ruby_1_9_1/rubytest.rb Index: ruby_1_9_1/ChangeLog =================================================================== --- ruby_1_9_1/ChangeLog (revision 21576) +++ ruby_1_9_1/ChangeLog (revision 21577) @@ -1,3 +1,7 @@ +Fri Jan 9 12:29:46 2009 Nobuyoshi Nakada <nobu@r...> + + * common.mk (test-sample), rubytest.rb: use runruby.rb + Fri Jan 16 01:09:37 2009 Koichi Sasada <ko1@a...> * ruby.c (process_options): decrement parse_in_eval to recognize Index: ruby_1_9_1/rubytest.rb =================================================================== --- ruby_1_9_1/rubytest.rb (revision 21576) +++ ruby_1_9_1/rubytest.rb (revision 21577) @@ -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 Index: ruby_1_9_1/common.mk =================================================================== --- ruby_1_9_1/common.mk (revision 21576) +++ ruby_1_9_1/common.mk (revision 21577) @@ -370,7 +370,7 @@ @$(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 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/