diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-07-06 09:23:53 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-07-06 09:23:53 +0000 |
commit | 616f4d33856a539e89aadfbf75ebb17acc7781da (patch) | |
tree | 8f07c8ae87b82e94b9aa721dc7ea33b34cab8ba3 | |
parent | 9aa9c07c077d918a2a70c7e60402d1e475c6686a (diff) |
* bootstraptest/runner.rb: fix load path.
* common.mk: fix "test" rule to run with "btest".
* rubytest.rb, sample/test.rb: fix to show tests progress.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12716 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | bootstraptest/runner.rb | 13 | ||||
-rw-r--r-- | common.mk | 1 | ||||
-rwxr-xr-x | rubytest.rb | 2 | ||||
-rw-r--r-- | sample/test.rb | 6 |
5 files changed, 24 insertions, 6 deletions
@@ -1,3 +1,11 @@ +Fri Jul 6 18:20:50 2007 Koichi Sasada <ko1@atdot.net> + + * bootstraptest/runner.rb: fix load path. + + * common.mk: fix "test" rule to run with "btest". + + * rubytest.rb, sample/test.rb: fix to show tests progress. + Fri Jul 6 15:37:48 2007 Koichi Sasada <ko1@atdot.net> * test/ruby/test_iterator.rb: fix test to 1.9 spec. diff --git a/bootstraptest/runner.rb b/bootstraptest/runner.rb index 556a1d9e12..53e2a1ec60 100644 --- a/bootstraptest/runner.rb +++ b/bootstraptest/runner.rb @@ -5,12 +5,18 @@ # Never use test/unit in this file. # Never use Ruby extensions in this file. -require 'fileutils' +begin + require 'fileutils' + require 'tmpdir' +rescue LoadError + $:.unshift File.join(File.dirname(__FILE__), '../lib') + retry +end def main @ruby = File.expand_path('miniruby') @verbose = false - dir = '/tmp/bootstraptest.tmpwd' + dir = File.join(Dir.tmpdir, 'bootstraptest.tmpwd') quiet = false tests = nil ARGV.delete_if {|arg| @@ -73,8 +79,7 @@ def exec_test(pathes) @errbuf = [] @location = nil pathes.each do |path| - puts - puts File.basename(path) + $stderr.print "\n#{File.basename(path)} " load File.expand_path(path) end $stderr.puts @@ -318,6 +318,7 @@ btest: $(MINIRUBY) PHONY $(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(MINIRUBY)" $(OPTS) test: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) PHONY + @$(MINIRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(MINIRUBY)" -q @$(MINIRUBY) $(srcdir)/rubytest.rb test-all: diff --git a/rubytest.rb b/rubytest.rb index c1236705c0..fb836735f5 100755 --- a/rubytest.rb +++ b/rubytest.rb @@ -39,7 +39,7 @@ error = '' srcdir = File.dirname(__FILE__) `#{ruby} -I#{srcdir}/lib #{srcdir}/sample/test.rb`.each_line do |line| if line =~ /^end of test/ - print "test succeeded\n" + print "\ntest succeeded\n" exit true end error << line if %r:^(sample/test.rb|not): =~ line diff --git a/sample/test.rb b/sample/test.rb index bda0d1837c..387630d66e 100644 --- a/sample/test.rb +++ b/sample/test.rb @@ -6,7 +6,7 @@ $ntest=0 $failed = 0 def test_check(what) - printf "%s\n", what + STDERR.print "\nsample/test.rb:#{what} " $what = what $testnum = 0 end @@ -16,11 +16,15 @@ def test_ok(cond,n=1) $ntest+=1 where = (st = caller(n)) ? st[0] : "caller error! (n=#{n}, trace=#{caller(0).join(', ')}" if cond + STDERR.print "." printf "ok %d (%s)\n", $testnum, where else + STDERR.print "F" printf "not ok %s %d -- %s\n", $what, $testnum, where $failed+=1 end + STDOUT.flush + STDERR.flush end # make sure conditional operators work |