From patchwork Wed Nov 30 18:30:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 61275 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D7F0C385B503 for ; Wed, 30 Nov 2022 18:30:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D7F0C385B503 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1669833040; bh=H/jKQuu+1RxrMwST5gG7H3krXWvpc4/MT65AwtBZV6c=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=Esl20T/hI1V1k/OsvS6RrbfUl37pnyVn0UyLFJf6miz5OIblbSkeTVv2SRecVNnFM flVWyqwfR9kbTJvIn94aNytu/0jAs11gkQkW+xxUteihN7vxXr2ctFmpIfgPNuzF9v cyhrKfurmmEHNgoFUNyn45VLVElkNsc6mkDeC1Hw= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by sourceware.org (Postfix) with ESMTPS id 1E4883858D1E for ; Wed, 30 Nov 2022 18:30:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1E4883858D1E Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 572B521B0C for ; Wed, 30 Nov 2022 18:30:14 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 3DAA413A70 for ; Wed, 30 Nov 2022 18:30:14 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id u0PWDTahh2PDeAAAMHmgww (envelope-from ) for ; Wed, 30 Nov 2022 18:30:14 +0000 To: gdb-patches@sourceware.org Subject: [pushed] [gdb/testsuite] Fix DUPLICATEs in s390-multiarch.exp Date: Wed, 30 Nov 2022 19:30:13 +0100 Message-Id: <20221130183013.10855-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Tom de Vries via Gdb-patches From: Tom de Vries Reply-To: Tom de Vries Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" 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 ... Fix this by using with_test_prefix. Tested on s390x-linux. --- gdb/testsuite/gdb.arch/s390-multiarch.exp | 50 ++++++++++++----------- 1 file changed, 27 insertions(+), 23 deletions(-) base-commit: a496d4a104f2f8edca9287ab62c8d4031a272035 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 } -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" } -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" } 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 } 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 } set binfile "${binprefix}-64"