diff options
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/lib/check-test-names.exp | 20 |
2 files changed, 25 insertions, 0 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index cd8440d..98cff46 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2020-05-12 Andrew Burgess <andrew.burgess@embecosm.com> + + * lib/check-test-names.exp: Disable when testing is being run in + parallel. + 2020-05-12 Tom de Vries <tdevries@suse.de> * gdb.base/jit-elf.exp: Fix string concat. diff --git a/gdb/testsuite/lib/check-test-names.exp b/gdb/testsuite/lib/check-test-names.exp index 4c0fde6..79139ad 100644 --- a/gdb/testsuite/lib/check-test-names.exp +++ b/gdb/testsuite/lib/check-test-names.exp @@ -18,6 +18,26 @@ # name. When a test includes the path in its test name it is harder # to compare results between two runs of GDB from different trees. +# This is a short term hack (12-May-2020). If we are running tests in +# parallel then we need support in the contrib/dg-extract-results.* +# scripts to merge the new result types generated by this file back +# into the single unified summary file. If this support is not in +# place then the dg-extract-results script will exit with an error. +# +# The script changes need to first be merged into the gcc repository, +# then copied over to the binutils-gdb repository. The required +# changes have been posted to the gcc list here: +# +# https://gcc.gnu.org/pipermail/gcc-patches/2020-May/545562.html +# +# But until these are merged into binutils-gdb the extra checks +# offered by this file can only be done when the tests are not running +# in parallel. +if {[info exists GDB_PARALLEL]} { + # Don't load this file. + return +} + namespace eval ::CheckTestNames { # An associative array of all test names to the number of times each # name is seen. Used to detect duplicate test names. |