From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <vries@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2205)
	id AD0933858D37; Wed, 30 Nov 2022 18:29:55 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AD0933858D37
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org;
	s=default; t=1669832995;
	bh=YRCTUGkG54rGsx/rIg5RdVVF3OG3HlwPM7diUVqKhDw=;
	h=From:To:Subject:Date:From;
	b=XTVPJMjqDXozXG6YJULhGS2CY66eLypR768awnvnXeHmW3YI7swlE7HzY6yRrlbEy
	 VElyijEPJ1T/ts5pkZFgzIuP+3m89Yg8ZZgMu5InSEqAvCyqImp4BGCFW37Vj027K0
	 +bLMxOYmZ7rSbChseovIeJZfS9RjA76fRr8xTCug=
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
From: Tom de Vries <vries@sourceware.org>
To: gdb-cvs@sourceware.org
Subject: [binutils-gdb] [gdb/testsuite] Fix DUPLICATEs in s390-multiarch.exp
X-Act-Checkin: binutils-gdb
X-Git-Author: Tom de Vries <tdevries@suse.de>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: a496d4a104f2f8edca9287ab62c8d4031a272035
X-Git-Newrev: f5c697b137b1f9d301cf89877a90c846f5b32e99
Message-Id: <20221130182955.AD0933858D37@sourceware.org>
Date: Wed, 30 Nov 2022 18:29:55 +0000 (GMT)
List-Id: <gdb-cvs.sourceware.org>

https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Df5c697b137b1=
f9d301cf89877a90c846f5b32e99

commit f5c697b137b1f9d301cf89877a90c846f5b32e99
Author: Tom de Vries <tdevries@suse.de>
Date:   Wed Nov 30 19:29:52 2022 +0100

    [gdb/testsuite] Fix DUPLICATEs in s390-multiarch.exp
   =20
    On s390x-linux, I run into:
    ...
    DUPLICATE: gdb.arch/s390-multiarch.exp: Linux v2
    DUPLICATE: gdb.arch/s390-multiarch.exp: Linux v2
    DUPLICATE: gdb.arch/s390-multiarch.exp: Linux v2
    ...
   =20
    Fix this by using with_test_prefix.
   =20
    Tested on s390x-linux.

Diff:
---
 gdb/testsuite/gdb.arch/s390-multiarch.exp | 50 +++++++++++++++++----------=
----
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/gdb/testsuite/gdb.arch/s390-multiarch.exp b/gdb/testsuite/gdb.=
arch/s390-multiarch.exp
index f0e85544bd5..71cb53a5db9 100644
--- a/gdb/testsuite/gdb.arch/s390-multiarch.exp
+++ b/gdb/testsuite/gdb.arch/s390-multiarch.exp
@@ -73,45 +73,49 @@ proc test_linux_v2 {} {
     return 0
 }
=20
-proc test_register_valid {reg variant} {
+proc test_register_valid {reg} {
     gdb_test "info reg $reg" \
 	"$reg\[ \t\]+0x\[0-9a-z\]+\[ \t\]+.*" \
-	"'$reg' exists ($variant)"
+	"'$reg' exists"
 }
=20
-proc test_register_invalid {reg variant} {
+proc test_register_invalid {reg} {
     gdb_test "info reg $reg" \
 	"Invalid register `$reg'.*" \
-	"'$reg' must not exist ($variant)"
+	"'$reg' must not exist"
 }
=20
 proc test_all_core64 {core type} {
     set variant "64-bit $type"
-    gdb_core_cmd $core "core-file ($variant)"
-    if { ! [test_linux_v2] } {
-	return
+    with_test_prefix $variant {
+	gdb_core_cmd $core "core-file"
+	if { ! [test_linux_v2] } {
+	    return
+	}
+	test_register_valid "last_break"
+	gdb_core_cmd "${core}.2" "core-file #2"
+	test_register_invalid "system_call"
+	gdb_core_cmd "${core}.3" "core-file #3"
+	test_register_invalid "last_break"
     }
-    test_register_valid "last_break" $variant
-    gdb_core_cmd "${core}.2" "core-file #2 ($variant)"
-    test_register_invalid "system_call" $variant
-    gdb_core_cmd "${core}.3" "core-file #3 ($variant)"
-    test_register_invalid "last_break" $variant
 }
=20
 proc test_all_core31 {core type} {
     set variant "31-bit $type"
-    gdb_core_cmd $core "core-file ($variant)"
-    if { ! [test_linux_v2] } {
-	return
+    with_test_prefix $variant {
+	gdb_core_cmd $core "core-file"
+	if { ! [test_linux_v2] } {
+	    return
+	}
+	test_register_valid "r0h"
+	test_register_valid "last_break"
+	gdb_core_cmd "${core}.1" "core-file #1 "
+	test_register_invalid "r0h"
+	gdb_core_cmd "${core}.2" "core-file #2"
+	test_register_invalid "system_call"
+	gdb_core_cmd "${core}.3" "core-file #3"
+	test_register_invalid "last_break"
     }
-    test_register_valid "r0h" $variant
-    test_register_valid "last_break" $variant
-    gdb_core_cmd "${core}.1" "core-file #1 ($variant)"
-    test_register_invalid "r0h" $variant
-    gdb_core_cmd "${core}.2" "core-file #2 ($variant)"
-    test_register_invalid "system_call" $variant
-    gdb_core_cmd "${core}.3" "core-file #3 ($variant)"
-    test_register_invalid "last_break" $variant
 }
=20
 set binfile "${binprefix}-64"