1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21405 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-01-09 03:29:10 +00:00
parent 057f2866b7
commit 040a7fa7e2
3 changed files with 11 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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> Fri Jan 9 10:40:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* test/ruby/test_process.rb (TestProcess::MANDATORY_ENVS): some * test/ruby/test_process.rb (TestProcess::MANDATORY_ENVS): some

2
common.mk
View File

@ -380,7 +380,7 @@ btest-ruby: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) PHONY
@$(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) -I$(srcdir)/lib" -q @$(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) -I$(srcdir)/lib" -q
test-sample: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) PHONY test-sample: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) PHONY
@$(MINIRUBY) $(srcdir)/rubytest.rb @$(RUNRUBY) $(srcdir)/rubytest.rb
test-knownbug: miniruby$(EXEEXT) $(PROGRAM) $(RBCONFIG) PHONY test-knownbug: miniruby$(EXEEXT) $(PROGRAM) $(RBCONFIG) PHONY
$(MINIRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM)" $(OPTS) $(srcdir)/KNOWNBUGS.rb $(MINIRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM)" $(OPTS) $(srcdir)/KNOWNBUGS.rb

33
rubytest.rb
View File

@ -1,43 +1,22 @@
#! ./miniruby #! ./miniruby
exit if defined?(CROSS_COMPILING) exit if defined?(CROSS_COMPILING)
load './rbconfig.rb' ruby = ENV["RUBY"]
include RbConfig unless ruby
load './rbconfig.rb'
ruby = "./#{CONFIG['ruby_install_name']}#{CONFIG['EXEEXT']}" ruby = "./#{RbConfig::CONFIG['ruby_install_name']}#{RbConfig::CONFIG['EXEEXT']}"
end
unless File.exist? ruby unless File.exist? ruby
print "#{ruby} is not found.\n" print "#{ruby} is not found.\n"
print "Try `make' first, then `make test', please.\n" print "Try `make' first, then `make test', please.\n"
exit false exit false
end 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) $stderr.reopen($stdout)
error = '' error = ''
srcdir = File.dirname(__FILE__) 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/ if line =~ /^end of test/
print "\ntest succeeded\n" print "\ntest succeeded\n"
exit true exit true