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

[Pedro Alves <pedro@palves.net>]

On 2021-11-21 17:56, Lancelot SIX via Gdb-patches wrote:
> 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.
> 
> Tested on x86_64-linux.
> ---
>  gdb/testsuite/gdb.base/shlib-call.exp | 13 ++++++++-----
>  1 file changed, 8 insertions(+), 5 deletions(-)
> 
> diff --git a/gdb/testsuite/gdb.base/shlib-call.exp b/gdb/testsuite/gdb.base/shlib-call.exp
> index 0a5a1c336c1..f7f20cc0127 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)"] {
> @@ -166,9 +166,12 @@ 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"
> +gdb_test_no_output "set print sevenbit-strings" \
> +    "set print sevenbit-strings, after restart"
> +gdb_test_no_output "set print address off" \
> +    "set print address off, after restart"
> +gdb_test_no_output "set width 0" \
> +    "set width 0, after restart"

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.

>  
>  
>  # PR's 16495, 18213
> @@ -193,4 +196,4 @@ gdb_test_multiple "" $test {
>      }
>  }
>  
> -gdb_continue_to_end "" continue 1
> +gdb_continue_to_end "after re-run" continue 1
>