From d1034d78788ef809b321282dbb984eed95696c56 Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Fri, 15 May 2020 11:46:52 +0100 Subject: [PATCH] gdb/testsuite: Revert commit 843f4d93576eef02139f7b1b3fa1cea7b0f286f1 Revert this commit: commit 843f4d93576eef02139f7b1b3fa1cea7b0f286f1 Date: Tue May 12 17:38:17 2020 +0100 gdb/testsuite: Disable path and duplicate checks when parallel testing Now that this commit has landed: commit c959562d9ba0b2eaf240c601b2c2fd49c42c1f2f Date: Fri May 15 11:23:59 2020 +0100 contrib: Update dg-extract-results.* from gcc We can now make use of the mechanism for detecting paths in test names and duplicate test names, even when we run tests in parallel. gdb/testsuite/ChangeLog: * lib/check-test-names.exp: Remove code that prevents this file loading when tests are run in parallel. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/lib/check-test-names.exp | 20 -------------------- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index b35d10e01b..5a523c2d2b 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2020-05-15 Andrew Burgess + + * lib/check-test-names.exp: Remove code that prevents this file + loading when tests are run in parallel. + 2020-05-15 Pedro Alves * gdb.multi/multi-kill.exp (start_inferior): Remove diff --git a/gdb/testsuite/lib/check-test-names.exp b/gdb/testsuite/lib/check-test-names.exp index 79139adea7..4c0fde6e4e 100644 --- a/gdb/testsuite/lib/check-test-names.exp +++ b/gdb/testsuite/lib/check-test-names.exp @@ -18,26 +18,6 @@ # 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. -- 2.34.1