From 224bb733aa9c2e030f6ec39e34c2209aff4d1ac3 Mon Sep 17 00:00:00 2001 From: murphy Date: Sun, 16 Apr 2006 00:50:38 +0000 Subject: test/suite.rb improved: now takes diff and lang arguments from rake. --- test/suite.rb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/test/suite.rb b/test/suite.rb index 94e9dd0..f877385 100644 --- a/test/suite.rb +++ b/test/suite.rb @@ -66,9 +66,9 @@ class CodeRaySuite < TestCase computed = output.sub('.out.', '.computed.') unless ok File.open(computed, 'w') { |f| f.write result } - print `gvimdiff #{output} #{computed}` if $DEBUG + print `gvimdiff #{output} #{computed}` if ENV['diff'] end - assert(ok, "Scan error: #{computed} != #{output}") unless $DEBUG + assert(ok, "Scan error: #{computed} != #{output}") unless ENV['diff'] else File.open(output, 'w') do |f| f.write result end puts "New test: #{output}" @@ -85,21 +85,22 @@ $suite = TestSuite.new def load_suite name begin - require name + '/suite.rb' + suite = File.join($mydir, name, 'suite.rb') + require suite rescue LoadError $stderr.puts <<-ERR -!! Suite #{name + '/suite.rb'} not found +!! Suite #{suite} not found ERR false end end -if subsuite = ARGV.find { |a| break $1 if a[/^([^-].*)/] } +if subsuite = ARGV.find { |a| break $1 if a[/^([^-].*)/] } || ENV['lang'] load_suite(subsuite) or exit else - Dir[File.join($mydir, '*', '')].each { |suite| load_suite suite } + Dir[File.join($mydir, '*', '')].each { |suite| load_suite File.basename(suite) } end if ARGV.include? '-f' -- cgit v1.2.1