[PATCHv2 2/3] gdb/testsuite: Detect and warn about duplicate test names

Andrew Burgess
2020-04-27T22:01:53Z

Building on the previous commit, this patch detects when two tests
have the same test name and causes Dejagnu to print a new result type
'# of duplicate test names' in the result summary.

Currently if the tests are run in parallel mode the new result type is
not merged into the combined summary file so users will need to run in
non-parallel mode to check this result. A later commit will fix this.

gdb/testsuite/ChangeLog:

* lib/check-test-names.exp (all_test_names): New global.
(duplicate_test_names_seen): New global.
(check_test_names): Check for duplicate test names.
(log_summary): Warn about duplicate test names.
(reset_vars): Reset counters for duplicate test names.
---
gdb/testsuite/ChangeLog | 8 +++++++
gdb/testsuite/lib/check-test-names.exp | 32 +++++++++++++++++++++-----
2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/gdb/testsuite/lib/check-test-names.exp b/gdb/testsuite/lib/check-test-names.exp
index 702dc6ef406..15c5544c8e4 100644
--- a/gdb/testsuite/lib/check-test-names.exp
+++ b/gdb/testsuite/lib/check-test-names.exp
@@ -19,13 +19,18 @@
# to compare results between two runs of GDB from different trees.

namespace eval ::CheckTestNames {
- # An associative array of counts of tests that include a path in their
- # test name. There are two counts, 'count', which counts occurrences
- # within a single variant run, and 'total', which counts across all
- # variants.
+ # An associative array of all test names to the number of times each
+ # name is seen. Used to detect duplicate test names.
+ variable all_test_names
+ array set all_test_names {}
+
+ # An associative array of counts of tests that either include a path in
+ # their test name, or have a duplicate test name. There are two counts
+ # for each issue, 'count', which counts occurrences within a single
+ # variant run, and 'total', which counts across all variants.
variable counts
array set counts {}
- foreach nm {paths} {
+ foreach nm {paths duplicates} {
set counts($nm,count) 0
set counts($nm,total) 0
}
@@ -46,6 +51,7 @@ namespace eval ::CheckTestNames {
# incremented.
proc check { message } {
global srcdir objdir
+ variable all_test_names

foreach path [list $srcdir $objdir] {
if { [ string first $path $message ] >= 0 } {
@@ -54,6 +60,16 @@ namespace eval ::CheckTestNames {
return
}
}
+
+ # Initialise a count, or increment the count for this test name.
+ if {![info exists all_test_names($message)]} {
+ set all_test_names($message) 0
+ } else {
+ if {$all_test_names($message) == 0} {
+ inc_count duplicates
+ }
+ incr all_test_names($message)
+ }
}

# If COUNT is greater than zero, disply PREFIX followed by COUNT.
@@ -81,17 +97,21 @@ namespace eval ::CheckTestNames {

maybe_show_count "# of paths in test names\t" \
$counts(paths,$which)
+ maybe_show_count "# of duplicate test names\t" \
+ $counts(duplicates,$which)
}

# Rename Dejagnu's reset_vars procedure, and create do_reset_vars to
# replace it. We arrange to have do_reset_vars called later.
rename ::reset_vars reset_vars
proc do_reset_vars {} {
+ variable all_test_names
variable counts

CheckTestNames::reset_vars

- foreach nm {paths} {
+ unset all_test_names
+ foreach nm {paths duplicates} {
set counts($nm,count) 0
}
}
--
2.25.3