From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id 135143858D1E for ; Wed, 30 Nov 2022 17:49:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 135143858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de 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-out2.suse.de (Postfix) with ESMTPS id 2F6361F45B for ; Wed, 30 Nov 2022 17:49:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1669830590; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=R7isz9xbt5FtRRCNZgsGtmeQ7j4HzhPlaIC1eoErjs8=; b=YSN5R37axb9tsF4Wah1TIaoCZlnVYF5DFnd6ndrPhrFRAb5GhZ29efh1KMaEqE56sSYF9B i50Xvdj4q5/1fI+UD9fMQBtBWVrirQsP1mcfcp4P7PYUKt1Z727M+BXzxArAtEG22zDJkd zD7MguJiicYWmoTaCBC9/1HiQOE1B54= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1669830590; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=R7isz9xbt5FtRRCNZgsGtmeQ7j4HzhPlaIC1eoErjs8=; b=rKtnczsF4OESfSIz43RCXkhDl4UnyT5Q1zPTDc9GpYmeeeLTDjaegYXcDejnp1AghJsDr5 EXnWhRdh8uTrxNCA== 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 1A2821331F for ; Wed, 30 Nov 2022 17:49:50 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id XWYKBb6Xh2PhZQAAMHmgww (envelope-from ) for ; Wed, 30 Nov 2022 17:49:50 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [pushed] [gdb/testsuite] Enable gdb.arch/s390-disassembler-options.exp for --enable-targets=all Date: Wed, 30 Nov 2022 18:49:49 +0100 Message-Id: <20221130174949.9624-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.6 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 List-Id: On s390x-linux, I run into: ... DUPLICATE: gdb.arch/s390-disassembler-options.exp: \ show disassembler-options esa ... First, reproduce this on x86_64-linux with --enable-targets=all, by replacing the test for 'istarget "s390*-*-*"' with a test for 'get_set_option_choices "set architecture" "s390"'. Fix the DUPLICATE by using with_test_prefix. Also modernize the test-case by using clean_restart instead of gdb_exit/gdb_start. Tested on x86_64-linux. --- .../gdb.arch/s390-disassembler-options.exp | 36 ++++++++++--------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/gdb/testsuite/gdb.arch/s390-disassembler-options.exp b/gdb/testsuite/gdb.arch/s390-disassembler-options.exp index 7ba9e51cc3c..df6c2363069 100644 --- a/gdb/testsuite/gdb.arch/s390-disassembler-options.exp +++ b/gdb/testsuite/gdb.arch/s390-disassembler-options.exp @@ -18,39 +18,43 @@ # This test exercises set/show disassembler-options results are preserved # across multiple set architecture calls. -if {![istarget "s390*-*-*"]} { - verbose "Skipping S390 disassembler options." - return -} - -gdb_exit -gdb_start +clean_restart -set option "esa" +set archs [get_set_option_choices "set architecture" "s390"] set arch1 "s390:64-bit" set arch2 "s390:31-bit" +foreach arch [list $arch1 $arch2] { + if { [lsearch -exact $archs $arch] == -1 } { + return + } +} -gdb_test "set architecture $arch1" \ +set option "esa" + +with_test_prefix $arch1 { + gdb_test "set architecture $arch1" \ "The target architecture is set to \"$arch1\"\." \ "set architecture $arch1" -gdb_test_no_output "set disassembler-options" -gdb_test "show disassembler-options" \ + gdb_test_no_output "set disassembler-options" + gdb_test "show disassembler-options" \ "The current disassembler options are ''.*" \ "show NULL disassembler-options" -gdb_test_no_output "set disassembler-options $option" -gdb_test "show disassembler-options" \ + gdb_test_no_output "set disassembler-options $option" + gdb_test "show disassembler-options" \ "The current disassembler options are '$option'.*" \ "show disassembler-options $option" +} # Change architectures and verify the disassembler options have been preserved. -gdb_test "set architecture $arch2" \ +with_test_prefix $arch2 { + gdb_test "set architecture $arch2" \ "The target architecture is set to \"$arch2\"\." \ "set architecture $arch2" -gdb_test "show disassembler-options" \ + gdb_test "show disassembler-options" \ "The current disassembler options are '$option'.*" \ "show disassembler-options $option" - +} base-commit: 885d86436c3f9ab0a13f39647860b526faa92cf8 -- 2.35.3