From: Lancelot SIX <lsix@lancelotsix.com>
Date: Fri, 19 Nov 2021 23:34:27 +0000 (+0000)
Subject: gdb/testsuite: Remove duplicates from gdb.base/solib-display.exp
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7a6a9616113ff071fc4a4014dc827c33f3f22292;p=binutils-gdb.git

gdb/testsuite: Remove duplicates from gdb.base/solib-display.exp

When running the testsuite, I have:

    Running .../gdb/testsuite/gdb.base/solib-display.exp ...
    DUPLICATE: gdb.base/solib-display.exp: NO: break 25
    DUPLICATE: gdb.base/solib-display.exp: NO: continue
    DUPLICATE: gdb.base/solib-display.exp: IN: break 25
    DUPLICATE: gdb.base/solib-display.exp: IN: continue
    DUPLICATE: gdb.base/solib-display.exp: SEP: break 25
    DUPLICATE: gdb.base/solib-display.exp: SEP: continue

The 'break 25' appears because the test inserts two breakpoints at the
same location.  Fix this by only inserting the breakpoint once.

Fix the 'continue' DUPLICATE by giving a phony name to the second
continue: 'continue two'.

While at it, this commit also removes a trailing space.

Tested on x86_64-linux.
---

diff --git a/gdb/testsuite/gdb.base/solib-display.exp b/gdb/testsuite/gdb.base/solib-display.exp
index a60644d6336..d67541374a3 100644
--- a/gdb/testsuite/gdb.base/solib-display.exp
+++ b/gdb/testsuite/gdb.base/solib-display.exp
@@ -140,7 +140,7 @@ foreach libsepdebug {NO IN SEP} { with_test_prefix "$libsepdebug" {
     # are not cleared permaturely.
 
     gdb_test "break [gdb_get_line_number "break here" ${testfile}.c]" \
-	    ".*Breakpoint.* at .*" 
+	    ".*Breakpoint.* at .*"
 
     gdb_test "continue"
     gdb_test "display main_global" "4: main_global = 44"
@@ -153,11 +153,9 @@ foreach libsepdebug {NO IN SEP} { with_test_prefix "$libsepdebug" {
     }
 
     gdb_test "" "6: a_static = 46\\r\\n4: main_global = 44\\r\\n.*"
-    gdb_test "break [gdb_get_line_number "break here" ${testfile}.c]" \
-	    ".*Breakpoint.* at .*" 
     gdb_test "continue" [multi_line \
 			     "4: main_global = 44" \
 			     "5: a_local = 45" \
 			     "6: a_static = 46" \
-			    ]
+			    ] "continue two"
 }}