summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--rubytest.rb14
2 files changed, 12 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index e751e86021..b59ff88a8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,11 @@
-Thu Apr 15 19:53:08 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Apr 15 19:57:11 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* process.c (pst_success_p): new method Process::Status#success?.
[ruby-dev:23385]
+ * rubytest.rb: do nothing while cross-compiling, return status in
+ system independent style.
+
Thu Apr 15 19:26:54 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* dir.c (rb_push_glob): Dir.glob() should return nil if block is given.
diff --git a/rubytest.rb b/rubytest.rb
index d664bcf3ae..18d5ca89ba 100644
--- a/rubytest.rb
+++ b/rubytest.rb
@@ -1,12 +1,14 @@
#! ./miniruby
+exit if defined?(CROSS_COMPILING)
load './rbconfig.rb'
include Config
-unless File.exist? "./#{CONFIG['ruby_install_name']}#{CONFIG['EXEEXT']}"
- print "./#{CONFIG['ruby_install_name']} is not found.\n"
+ruby = "./#{CONFIG['ruby_install_name']}#{CONFIG['EXEEXT']}"
+unless File.exist? ruby
+ print "#{ruby} is not found.\n"
print "Try `make' first, then `make test', please.\n"
- exit 1
+ exit false
end
if File.exist? CONFIG['LIBRUBY_SO']
@@ -35,13 +37,13 @@ $stderr.reopen($stdout)
error = ''
srcdir = File.dirname(__FILE__)
-`./#{CONFIG["ruby_install_name"]}#{CONFIG["EXEEXT"]} -I#{srcdir}/lib #{srcdir}/sample/test.rb`.each do |line|
+`#{ruby} -I#{srcdir}/lib #{srcdir}/sample/test.rb`.each do |line|
if line =~ /^end of test/
print "test succeeded\n"
- exit 0
+ exit true
end
error << line if line =~ %r:^(sample/test.rb|not):
end
print error
print "test failed\n"
-exit 1
+exit false