From aaff91fdf209a03c91a59681ca187c92d94826b8 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Fri, 19 Nov 2021 19:05:37 +0000
Subject: [PATCH] gdb/testsuite: Remove duplicates from gdb.base/miscexprs.exp
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

When running the testsuite I see:

    Running .../gdb/testsuite/gdb.base/miscexprs.exp ...
    DUPLICATE: gdb.base/miscexprs.exp: print value of !ibig.i[100]
    DUPLICATE: gdb.base/miscexprs.exp: print value of !ibig.i[100]

This is due to an explicit test name repeated across multiple tests.
The actual test explicit names do not add much over the command from
wich default test names are derived.

Fix by removing the explicit test names across the file where they do
not add value.  While at doing some cleaning, also use $gdb_test_name in
the various uses of gdb_test_multiple.

Tested on x86_64-linux.
---
 gdb/testsuite/gdb.base/miscexprs.exp | 73 +++++++++++-----------------
 1 file changed, 28 insertions(+), 45 deletions(-)

diff --git a/gdb/testsuite/gdb.base/miscexprs.exp b/gdb/testsuite/gdb.base/miscexprs.exp
index cbf6715758d..68d8cab656c 100644
--- a/gdb/testsuite/gdb.base/miscexprs.exp
+++ b/gdb/testsuite/gdb.base/miscexprs.exp
@@ -69,85 +69,68 @@ gdb_test "up" " main .*" "up from marker1"
 
 global hex
 
-gdb_test "print &ibig.i\[0\]" " = \\(int \\*\\) $hex" \
-    "print value of &ibig.i\[0\]"
+gdb_test "print &ibig.i\[0\]" " = \\(int \\*\\) $hex"
 
-gdb_test_multiple "print &cbig.c\[0\]" "print value of &cbig.c\[0\]" {
+gdb_test_multiple "print &cbig.c\[0\]" "" {
     -re ".\[0-9\]* = $hex \"\".*$gdb_prompt $" {
-        pass "print value of &cbig.c\[0\]"
+        pass $gdb_test_name
     }
     -re ".\[0-9\]* = $hex \"*\".*$gdb_prompt $" {
-        pass "print value of &cbig.c\[0\]"
+        pass $gdb_test_name
     }
 }
 
-gdb_test "print &fbig.f\[0\]" " = \\(float \\*\\) $hex" \
-    "print value of &fbig.f\[0\]"
+gdb_test "print &fbig.f\[0\]" " = \\(float \\*\\) $hex"
 
-gdb_test "print &dbig.d\[0\]" " = \\(double \\*\\) $hex" \
-    "print value of &dbig.d\[0\]"
+gdb_test "print &dbig.d\[0\]" " = \\(double \\*\\) $hex"
 
-gdb_test_multiple "print &sbig.s\[0\]" "print value of &sbig.s\[0\]" {
+gdb_test_multiple "print &sbig.s\[0\]" "" {
     -re ".\[0-9\]* = \\(short \\*\\) $hex.*$gdb_prompt $" {
-        pass "print value of &sbig.s\[0\]"
+        pass $gdb_test_name
     }
     -re ".\[0-9\]* = \\(short int \\*\\) $hex.*$gdb_prompt $" {
-        pass "print value of &sbig.s\[0\]"
+        pass $gdb_test_name
     }
 }
 
-gdb_test_multiple "print &lbig.l\[0\]" "print value of &lbig.l\[0\]" {
+gdb_test_multiple "print &lbig.l\[0\]" "" {
     -re ".\[0-9\]* = \\(long \\*\\) $hex.*$gdb_prompt $" {
-        pass "print value of &lbig.l\[0\]"
+        pass $gdb_test_name
     }
     -re ".\[0-9\]* = \\(long int \\*\\) $hex.*$gdb_prompt $" {
-        pass "print value of &lbig.l\[0\]"
+        pass $gdb_test_name
     }
 }
 
-gdb_test "print ibig.i\[100\] | 1" " = 5" \
-    "print value of ibig.i\[100\] | 1"
+gdb_test "print ibig.i\[100\] | 1" " = 5"
 
-gdb_test "print sbig.s\[90\] & 127" " = 127" \
-    "print value of sbig.s\[90\] & 127"
+gdb_test "print sbig.s\[90\] & 127" " = 127"
 
-gdb_test "print !ibig.i\[100\]" " = $false" \
-    "print value of !ibig.i\[100\]"
+gdb_test "print !ibig.i\[100\]" " = $false"
 
-gdb_test "print !sbig.s\[90\]" " = $false" \
-    "print value of !sbig.s\[90\]"
+gdb_test "print !sbig.s\[90\]" " = $false"
 
-gdb_test "print !fbig.f\[100\]" " = $false" \
-    "print value of !ibig.i\[100\]"
+gdb_test "print !fbig.f\[100\]" " = $false"
 
-gdb_test "print !dbig.d\[202\]" " = $false" \
-    "print value of !ibig.i\[100\]"
+gdb_test "print !dbig.d\[202\]" " = $false"
 
-gdb_test "print sbig.s\[90\] * 10" " = 2550" \
-    "print value of !sbig.s\[90\] * 10"
+gdb_test "print sbig.s\[90\] * 10" " = 2550"
 
-gdb_test "print ibig.i\[100\] * sbig.s\[90\]" " = 1275" \
-    "print value of ibig.i\[100\] * sbig.s\[90\]"
+gdb_test "print ibig.i\[100\] * sbig.s\[90\]" " = 1275"
 
-gdb_test "print fbig.f\[100\] * dbig.d\[202\]" " = 119.99\[0-9\]*" \
-    "print value of fbig.f\[100\] * dbig.d\[202\]"
+gdb_test "print fbig.f\[100\] * dbig.d\[202\]" " = 119.99\[0-9\]*"
 
-gdb_test "print !(sbig.s\[90\] * 2)" " = $false" \
-    "print value of !(sbig.s\[90\] * 2)"
+gdb_test "print !(sbig.s\[90\] * 2)" " = $false"
 
-gdb_test "print sizeof(sbig)" " = 800" "print value of sizeof sbig"
+gdb_test "print sizeof(sbig)" " = 800"
 
-gdb_test "print sizeof(cbig)" " = 100" "print value of sizeof cbig"
+gdb_test "print sizeof(cbig)" " = 100"
 
-gdb_test "print sizeof(lbig)/sizeof(long)" " = 900" \
-    "print value of sizeof lbig / sizeof long"
+gdb_test "print sizeof(lbig)/sizeof(long)" " = 900"
 
-gdb_test "print ibig.i\[100\] << 2" " = 20" \
-    "print value of ibig.i\[100\] << 2"
+gdb_test "print ibig.i\[100\] << 2" " = 20"
 
-gdb_test "print sbig.s\[90\] >> 4" " = 15" \
-    "print value of sbig.s\[90\] >> 4"
+gdb_test "print sbig.s\[90\] >> 4" " = 15"
 
-gdb_test "print lbig.l\[333\] >> 6" " = 15624999" \
-    "print value of lbig.l\[333\] >> 6"
+gdb_test "print lbig.l\[333\] >> 6" " = 15624999"
 
-- 
2.30.2