Author: coolo Date: Fri Apr 18 14:03:00 2008 New Revision: 9699 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9699&view=rev Log: correctly exit != 0 if there were errors Modified: trunk/sat-solver/testsuite/runtest.rb Modified: trunk/sat-solver/testsuite/runtest.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/runtest.rb?rev=9699&r1=9698&r2=9699&view=diff ============================================================================== --- trunk/sat-solver/testsuite/runtest.rb (original) +++ trunk/sat-solver/testsuite/runtest.rb Fri Apr 18 14:03:00 2008 @@ -32,6 +32,7 @@ $topdir = Dir.getwd $fails = Array.new $ignorecount = 0 +$exitcode = 0 class CompareResult Incomplete = 0 @@ -49,12 +50,14 @@ f1 = File.new( name1, "r" ) rescue STDERR.puts "Cannot open #{name1}" + $exitcode = 1 return false end begin f2 = File.new( name2, "r" ) rescue STDERR.puts "Cannot open #{name2}" + $exitcode = 1 return false end a1 = f1.readlines @@ -116,6 +119,7 @@ problemFound = true when /> install /, /> upgrade /, /> remove / STDERR.puts "No 'Solution' in #{fname}" unless solution + $exitcode = 1 solution << l else if problemFound @@ -143,6 +147,7 @@ end unless File.readable?( rname ) STDERR.puts "Cannot open #{rname}" + $exitcode = 1 return CompareResult::Incomplete end @@ -197,7 +202,6 @@ return CompareResult::UnexpectedFailure end - STDERR.puts "#{rname} failed" if $verbose Solution.filediff( sname, rname) @@ -266,13 +270,19 @@ end } puts "\n\t==> #{$tests.size} tests: (exp:#{epassed}/unexp:#{upassed}) passed, (exp:#{efailed}/unexp:#{ufailed}) failed, #{$ignorecount} ignored <==\n" + assert(ufailed == 0, 'Unexpected failures') + assert(upassed == 0, 'Unexpected passes') + assert($exitcode == 0, 'Misc errors') end end class Runner def run wd, arg, recurse=nil - fullname = File.join( wd, arg ) + fullname = arg + if wd: + fullname = File.join( wd, arg ) + end #puts "Examine #{fullname}" if File.directory?( fullname ) rundir( fullname, recurse ) @@ -416,6 +426,7 @@ #puts "Dir #{fullname}" next unless recursive if tags.include?( fname ) + $exitcode = 1 STDERR.puts "Directory #{fname} already seen, symlink loop ?" next end @@ -429,6 +440,7 @@ args << fullname add( args ) else + $exitcode = 1 STDERR.puts "Unknown file #{fullname} : #{File.stat(fullname).ftype}, skipping" end } @@ -486,3 +498,4 @@ wd = "." unless arg[0,1] == "/" r.run wd, arg, recurse } + -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org