Author: haass Date: Fri Jan 11 15:23:12 2008 New Revision: 8262 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8262&view=rev Log: Added support for satsolution-files Modified: trunk/libzypp-testsuite/solver/lib/solver_init.exp Modified: trunk/libzypp-testsuite/solver/lib/solver_init.exp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/lib/solver_init.exp?rev=8262&r1=8261&r2=8262&view=diff ============================================================================== --- trunk/libzypp-testsuite/solver/lib/solver_init.exp (original) +++ trunk/libzypp-testsuite/solver/lib/solver_init.exp Fri Jan 11 15:23:12 2008 @@ -212,6 +212,7 @@ set mistakefile "$testBase_name.mistake" set difffile "$testBase_name.diff" set solutionfile "$testBase_name.solution" + set satsolutionfile "$testBase_name.satsolution" # run the test @@ -240,7 +241,8 @@ set icount 1 - if { ( [ file exists $dircase/$solutionfile ] == 0 ) && ( [ file exists $dircase/$solutionfile$icount ] == 0 ) } { + if { ( [ file exists $dircase/$solutionfile ] == 0 ) && ( [ file exists $dircase/$solutionfile$icount ] == 0 ) + && ( [ file exists $dircase/$satsolutionfile ] == 0 ) && ( [ file exists $dircase/$satsolutionfile$icount ] == 0 ) } { if { $expect_to_fail == 1 } { xfail $testBase_name continue @@ -249,6 +251,7 @@ } else { set ibool 1 set command "(cd $dircase; /usr/bin/diff -u $solutionfile $mistakefile > $difffile)" + set commandsat "(cd $dircase; /usr/bin/diff -u $satsolutionfile $mistakefile > $difffile)" while { $ibool == 1 } { set oops [catch { set result [exec sh -c $command] } catched] if { $oops == "0" } { @@ -257,12 +260,25 @@ puts "\tsolution $output was the right one" } break - } + } + set oops [catch { set result [exec sh -c $commandsat] } catched] + if { $oops == "0" } { + if { $icount > 1 } { + set output [expr $icount - 1] + puts "\tsatsolution $output was the right one" + } + break + } if { [ file exists $dircase/$solutionfile$icount ] == 1 } { set command "(cd $dircase; /usr/bin/diff -u $solutionfile$icount $mistakefile > $difffile)" incr icount } else { - set ibool 0 + if { [ file exists $dircase/$satsolutionfile$icount ] == 1 } { + set commandsat "(cd $dircase; /usr/bin/diff -u $satsolutionfile$icount $mistakefile > $difffile)" + incr icount + } else { + set ibool 0 + } } } if { $oops != "0" } { -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org