Fossil SCM
Revise test result summary to include 'ignored' results from tests marked with 'knownBug'.
Commit
f77fbed8e306e22ead8e50d6c525e212f6e699b5
Parent
60285f587651281…
1 file changed
+12
-3
+12
-3
| --- test/tester.tcl | ||
| +++ test/tester.tcl | ||
| @@ -336,11 +336,11 @@ | ||
| 336 | 336 | |
| 337 | 337 | # Perform a test |
| 338 | 338 | # |
| 339 | 339 | set test_count 0 |
| 340 | 340 | proc test {name expr {constraints ""}} { |
| 341 | - global bad_test test_count RESULT | |
| 341 | + global bad_test ignored_test test_count RESULT | |
| 342 | 342 | incr test_count |
| 343 | 343 | set knownBug [expr {"knownBug" in $constraints}] |
| 344 | 344 | set r [uplevel 1 [list expr $expr]] |
| 345 | 345 | if {$r} { |
| 346 | 346 | if {$knownBug && !$::STRICT} { |
| @@ -349,19 +349,21 @@ | ||
| 349 | 349 | protOut "test $name OK" |
| 350 | 350 | } |
| 351 | 351 | } else { |
| 352 | 352 | if {$knownBug && !$::STRICT} { |
| 353 | 353 | protOut "test $name FAILED (knownBug)!" 1 |
| 354 | + lappend ignored_test $name | |
| 354 | 355 | } else { |
| 355 | 356 | protOut "test $name FAILED!" 1 |
| 356 | 357 | if {$::QUIET} {protOut "RESULT: $RESULT" 1} |
| 357 | 358 | lappend bad_test $name |
| 358 | 359 | if {$::HALT} exit |
| 359 | 360 | } |
| 360 | 361 | } |
| 361 | 362 | } |
| 362 | 363 | set bad_test {} |
| 364 | +set ignored_test {} | |
| 363 | 365 | |
| 364 | 366 | # Return a random string N characters long. |
| 365 | 367 | # |
| 366 | 368 | set vocabulary 01234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" |
| 367 | 369 | append vocabulary " ()*^!.eeeeeeeeaaaaattiioo " |
| @@ -511,10 +513,17 @@ | ||
| 511 | 513 | protOut "***** End of $testfile: [llength $bad_test] errors so far ******" |
| 512 | 514 | cd $origwd |
| 513 | 515 | } |
| 514 | 516 | set nErr [llength $bad_test] |
| 515 | 517 | if {$nErr>0 || !$::QUIET} { |
| 516 | - protOut "***** Final result: $nErr errors out of $test_count tests" 1 | |
| 518 | + protOut "***** Final results: $nErr errors out of $test_count tests" 1 | |
| 519 | +} | |
| 520 | +if {$nErr>0} { | |
| 521 | + protOut "***** Considered failures: $bad_test" 1 | |
| 522 | +} | |
| 523 | +set nErr [llength $ignored_test] | |
| 524 | +if {$nErr>0 || !$::QUIET} { | |
| 525 | + protOut "***** Ignored results: $nErr ignored errors out of $test_count tests" 1 | |
| 517 | 526 | } |
| 518 | 527 | if {$nErr>0} { |
| 519 | - protOut "***** Failures: $bad_test" 1 | |
| 528 | + protOut "***** Ignored failures: $ignored_test" 1 | |
| 520 | 529 | } |
| 521 | 530 |
| --- test/tester.tcl | |
| +++ test/tester.tcl | |
| @@ -336,11 +336,11 @@ | |
| 336 | |
| 337 | # Perform a test |
| 338 | # |
| 339 | set test_count 0 |
| 340 | proc test {name expr {constraints ""}} { |
| 341 | global bad_test test_count RESULT |
| 342 | incr test_count |
| 343 | set knownBug [expr {"knownBug" in $constraints}] |
| 344 | set r [uplevel 1 [list expr $expr]] |
| 345 | if {$r} { |
| 346 | if {$knownBug && !$::STRICT} { |
| @@ -349,19 +349,21 @@ | |
| 349 | protOut "test $name OK" |
| 350 | } |
| 351 | } else { |
| 352 | if {$knownBug && !$::STRICT} { |
| 353 | protOut "test $name FAILED (knownBug)!" 1 |
| 354 | } else { |
| 355 | protOut "test $name FAILED!" 1 |
| 356 | if {$::QUIET} {protOut "RESULT: $RESULT" 1} |
| 357 | lappend bad_test $name |
| 358 | if {$::HALT} exit |
| 359 | } |
| 360 | } |
| 361 | } |
| 362 | set bad_test {} |
| 363 | |
| 364 | # Return a random string N characters long. |
| 365 | # |
| 366 | set vocabulary 01234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" |
| 367 | append vocabulary " ()*^!.eeeeeeeeaaaaattiioo " |
| @@ -511,10 +513,17 @@ | |
| 511 | protOut "***** End of $testfile: [llength $bad_test] errors so far ******" |
| 512 | cd $origwd |
| 513 | } |
| 514 | set nErr [llength $bad_test] |
| 515 | if {$nErr>0 || !$::QUIET} { |
| 516 | protOut "***** Final result: $nErr errors out of $test_count tests" 1 |
| 517 | } |
| 518 | if {$nErr>0} { |
| 519 | protOut "***** Failures: $bad_test" 1 |
| 520 | } |
| 521 |
| --- test/tester.tcl | |
| +++ test/tester.tcl | |
| @@ -336,11 +336,11 @@ | |
| 336 | |
| 337 | # Perform a test |
| 338 | # |
| 339 | set test_count 0 |
| 340 | proc test {name expr {constraints ""}} { |
| 341 | global bad_test ignored_test test_count RESULT |
| 342 | incr test_count |
| 343 | set knownBug [expr {"knownBug" in $constraints}] |
| 344 | set r [uplevel 1 [list expr $expr]] |
| 345 | if {$r} { |
| 346 | if {$knownBug && !$::STRICT} { |
| @@ -349,19 +349,21 @@ | |
| 349 | protOut "test $name OK" |
| 350 | } |
| 351 | } else { |
| 352 | if {$knownBug && !$::STRICT} { |
| 353 | protOut "test $name FAILED (knownBug)!" 1 |
| 354 | lappend ignored_test $name |
| 355 | } else { |
| 356 | protOut "test $name FAILED!" 1 |
| 357 | if {$::QUIET} {protOut "RESULT: $RESULT" 1} |
| 358 | lappend bad_test $name |
| 359 | if {$::HALT} exit |
| 360 | } |
| 361 | } |
| 362 | } |
| 363 | set bad_test {} |
| 364 | set ignored_test {} |
| 365 | |
| 366 | # Return a random string N characters long. |
| 367 | # |
| 368 | set vocabulary 01234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" |
| 369 | append vocabulary " ()*^!.eeeeeeeeaaaaattiioo " |
| @@ -511,10 +513,17 @@ | |
| 513 | protOut "***** End of $testfile: [llength $bad_test] errors so far ******" |
| 514 | cd $origwd |
| 515 | } |
| 516 | set nErr [llength $bad_test] |
| 517 | if {$nErr>0 || !$::QUIET} { |
| 518 | protOut "***** Final results: $nErr errors out of $test_count tests" 1 |
| 519 | } |
| 520 | if {$nErr>0} { |
| 521 | protOut "***** Considered failures: $bad_test" 1 |
| 522 | } |
| 523 | set nErr [llength $ignored_test] |
| 524 | if {$nErr>0 || !$::QUIET} { |
| 525 | protOut "***** Ignored results: $nErr ignored errors out of $test_count tests" 1 |
| 526 | } |
| 527 | if {$nErr>0} { |
| 528 | protOut "***** Ignored failures: $ignored_test" 1 |
| 529 | } |
| 530 |