Re: [PATCH 21/29] gdb/testsuite: Remove duplicates from gdb.base/shlib-call.exp

[Lancelot SIX via Gdb-patches <gdb-patches@sourceware.org>]

> Let's not fix DUPLICATEs with duplication.  :-)  Write instead:
> 
> with_test_prefix "after restart" {
>   gdb_test_no_output "set print sevenbit-strings"
>   gdb_test_no_output "set print address off"
>   gdb_test_no_output "set width 0"
> }
> 
> Actually, I take that back.  We should just delete these 3 "set" commands and the same ones
> at the bottom too.  Setting width to 0 is already done centrally.  The other two make
> no difference in this test.  I strongly suspect this is very very old test code.
> 
> The "Start with a fresh gdb" block could just use clean_restart.

Hi,

I did the changes and added some more cleanup (removed trailing
whitespaces).

Thanks,
Lancelot.

---
From 9648f0f6164059dac483c217c8e82784a2a2b7c1 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Sun, 21 Nov 2021 01:33:13 +0000
Subject: [PATCH] gdb/testsuite: Remove duplicates from gdb.base/shlib-call.exp

When I run the testsuite, I have:

    Running .../gdb/testsuite/gdb.base/shlib-call.exp ...
    DUPLICATE: gdb.base/shlib-call.exp: print g
    DUPLICATE: gdb.base/shlib-call.exp: set print sevenbit-strings
    DUPLICATE: gdb.base/shlib-call.exp: set print address off
    DUPLICATE: gdb.base/shlib-call.exp: set width 0
    DUPLICATE: gdb.base/shlib-call.exp: continue until exit

Fix by adjusting the test names when required, and by removing
un-necessary commands.

While at it, do some cleanup:
- Replace an explicit GDB restart sequence with a call to clean_restart.
- Remove trailing whitespaces.
- Use $gdb_test_name in gdb_test_multiple.

Tested on x86_64-linux.
---
 gdb/testsuite/gdb.base/shlib-call.exp | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/gdb/testsuite/gdb.base/shlib-call.exp b/gdb/testsuite/gdb.base/shlib-call.exp
index 0a5a1c336c1..3fe9932af99 100644
--- a/gdb/testsuite/gdb.base/shlib-call.exp
+++ b/gdb/testsuite/gdb.base/shlib-call.exp
@@ -90,7 +90,7 @@ if ![gdb_skip_stdio_test "next over shr1"] {
 
 
 #print g
-gdb_test "print g" "\[0-9\]* = 2"
+gdb_test "print g" "\[0-9\]* = 2" "print g two"
 
 #print shr1(1)
 if ![gdb_skip_stdio_test "print shr1(1)"] {
@@ -137,7 +137,7 @@ gdb_test "print mainshr1(1)" "\[0-9\]* = 2" \
 # behavior will differ depending upon upon whether or not
 # the compiler emits line number information for the epilogue.
 gdb_test_multiple "step" "step out of shr2 to main" {
-    -re "main \\(\\) at.*g = mainshr1\\(g\\);.*$gdb_prompt $" { 
+    -re "main \\(\\) at.*g = mainshr1\\(g\\);.*$gdb_prompt $" {
 	pass "step out of shr2 to main"
     }
     -re ".*\\\}.*$gdb_prompt $" {
@@ -152,7 +152,7 @@ gdb_test_multiple "step" "step out of shr2 to main" {
 	}
     }
 }
-    
+
 #print mainshr1(1)
 gdb_test "print mainshr1(1)" "\[0-9\]* = 2"
 
@@ -162,14 +162,7 @@ gdb_test "step" "mainshr1 \\(g=4\\) at.*return 2.g;" \
 
 # Start with a fresh gdb.
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-gdb_test_no_output "set print sevenbit-strings"
-gdb_test_no_output "set print address off"
-gdb_test_no_output "set width 0"
-
+clean_restart $binfile
 
 # PR's 16495, 18213
 # test that we can re-set breakpoints in shared libraries
@@ -179,7 +172,7 @@ set test "run to bp in shared library"
 gdb_run_cmd
 gdb_test_multiple "" $test {
     -re "Breakpoint .,.*${gdb_prompt} " {
-	pass $test
+	pass $gdb_test_name
     }
 }
 
@@ -189,8 +182,8 @@ set test "re-run to bp in shared library (PR's 16495, 18213)"
 gdb_run_cmd
 gdb_test_multiple "" $test {
     -re "Breakpoint .,.*${gdb_prompt} " {
-	pass $test
+	pass $gdb_test_name
     }
 }
 
-gdb_continue_to_end "" continue 1
+gdb_continue_to_end "after re-run" continue 1