Browse Source

* lib/framework.exp (log_summary): Remove "testcnt" mechanism.

* testsuite/lib/libsup.exp: Remove obsolete "testcnt" variable.

Signed-off-by: Ben Elliston <bje@gnu.org>
psql
Jacob Bachmeyer 8 years ago
committed by Ben Elliston
parent
commit
93609ae19e
  1. 7
      ChangeLog
  2. 33
      lib/framework.exp
  3. 1
      testsuite/lib/libsup.exp

7
ChangeLog

@ -1,3 +1,8 @@
2018-12-14 Jacob Bachmeyer <jcb62281@gmail.com>
* lib/framework.exp (log_summary): Remove "testcnt" mechanism.
* testsuite/lib/libsup.exp: Remove obsolete "testcnt" variable.
2018-12-12 Ben Elliston <bje@gnu.org>
* config/gdb-comm.exp, config/gdb_stub.exp, config/vxworks.exp,
@ -95,7 +100,7 @@
2018-12-11 Jacob Bachmeyer <jcb62281@gmail.com>
* doc/dejagnu.texi (getdirs procedure): Document hard-coded
* doc/dejagnu.texi (getdirs procedure): Document hard-coded
directory exclusions by name in this procedure.
2018-12-10 Ben Elliston <bje@gnu.org>

33
lib/framework.exp

@ -403,7 +403,6 @@ proc log_summary { args } {
global mailing_list
global current_target_name
global test_counts
global testcnt
if { [llength $args] == 0 } {
set which "count"
@ -417,38 +416,6 @@ proc log_summary { args } {
clone_output "\n\t\t=== $tool Summary ===\n"
}
# If the tool set `testcnt', it wants us to do a sanity check on the
# total count, so compare the reported number of testcases with the
# expected number. Maintaining an accurate count in `testcnt' isn't easy
# so it's not clear how often this will be used.
if {[info exists testcnt]} {
if { $testcnt > 0 } {
set totlcnt 0
# total all the testcases reported
foreach x { FAIL PASS XFAIL KFAIL XPASS KPASS UNTESTED UNRESOLVED UNSUPPORTED } {
incr totlcnt test_counts($x,$which)
}
set testcnt test_counts(total,$which)
if { $testcnt>$totlcnt || $testcnt<$totlcnt } {
if { $testcnt > $totlcnt } {
set mismatch "unreported [expr {$testcnt - $totlcnt}]"
}
if { $testcnt < $totlcnt } {
set mismatch "misreported [expr {$totlcnt - $testcnt}]"
}
} else {
verbose "# of testcases run $testcnt"
}
if {[info exists mismatch]} {
clone_output "### ERROR: totals do not equal number of testcases run"
clone_output "### ERROR: # of testcases expected $testcnt"
clone_output "### ERROR: # of testcases reported $totlcnt"
clone_output "### ERROR: # of testcases $mismatch\n"
}
}
}
foreach x { PASS FAIL XPASS XFAIL KPASS KFAIL UNRESOLVED UNTESTED UNSUPPORTED } {
set val $test_counts($x,$which)
if { $val > 0 } {

1
testsuite/lib/libsup.exp

@ -43,7 +43,6 @@ proc make_defaults_file { defs } {
puts $fd "set target_triplet $target_triplet"
puts $fd "set target_os $target_os"
puts $fd "set target_cpu $target_cpu"
puts $fd "set testcnt 0"
puts $fd "set warncnt 0"
puts $fd "set errcnt 0"
puts $fd "set passcnt 0"

Loading…
Cancel
Save