diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-17 07:58:14 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-17 07:58:14 (GMT) |
| commit | 76e4a719173d94a2417a695ce30efcb47adac5a5 (patch) | |
| tree | 69685dc610c7b36d6cb11c9b06a0b0c1c687480b | |
| parent | 52f93c85fd4b12afc887e78f895f6dd7e33983db (diff) | |
| parent | 23520a764859890cb326fdc38a68180f11081549 (diff) | |
| download | tcl-76e4a719173d94a2417a695ce30efcb47adac5a5.zip tcl-76e4a719173d94a2417a695ce30efcb47adac5a5.tar.gz tcl-76e4a719173d94a2417a695ce30efcb47adac5a5.tar.bz2 | |
Fix [835c93c000]: TIP #525 only implemented for non-singleproc case
| -rw-r--r-- | library/tcltest/tcltest.tcl | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/library/tcltest/tcltest.tcl b/library/tcltest/tcltest.tcl index 2af79bc..e7f4288 100644 --- a/library/tcltest/tcltest.tcl +++ b/library/tcltest/tcltest.tcl @@ -2798,7 +2798,6 @@ proc tcltest::runAllTests { {shell ""} } { variable numTests variable failFiles variable DefaultValue - set failFilesAccum {} FillFilesExisted if {[llength [info level 0]] == 1} { @@ -2854,8 +2853,18 @@ proc tcltest::runAllTests { {shell ""} } { flush [outputChannel] if {[singleProcess]} { - incr numTestFiles - uplevel 1 [list ::source $file] + if {[catch { + incr numTestFiles + uplevel 1 [list ::source $file] + } msg]} { + puts [outputChannel] "Test file error: $msg" + # append the name of the test to a list to be reported + # later + lappend testFileFailures $file + } + if {$numTests(Failed) > 0} { + set failFilesSet 1 + } } else { # Pass along our configuration to the child processes. # EXCEPT for the -outfile, because the parent process @@ -2888,7 +2897,7 @@ proc tcltest::runAllTests { {shell ""} } { } if {$Failed > 0} { lappend failFiles $testFile - lappend failFilesAccum $testFile + set failFilesSet 1 } } elseif {[regexp [join { {^Number of tests skipped } @@ -2935,7 +2944,7 @@ proc tcltest::runAllTests { {shell ""} } { puts [outputChannel] "" puts [outputChannel] [string repeat ~ 44] } - return [expr {[info exists testFileFailures] || [llength $failFilesAccum]}] + return [expr {[info exists testFileFailures] || [info exists failFilesSet]}] } ##################################################################### |