From patchwork Fri Jan 27 21:01:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 63816 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 175CE385802F for ; Fri, 27 Jan 2023 21:02:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 175CE385802F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1674853335; bh=W6rODDdOTC/WESkmR7IC8oK1BWwyfW50Hz7aBNfzmZ0=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=ilK7YjXuo7cH8Nha5ksk8ULfGcTsYznEYaPVaB1HEtOO1tAej8Yiwswm4NnHhSIdJ lYeav2B8/nwQ4vdEEQbaikO7uSyCjP0txm/Zy+UfjSEXdS9Ddz+vNm6w3gN2zHIk9j ausKTm/In+/Z34wM6NYyMcplKUuuJo2CuOEVjgGM= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id EE4333858D38 for ; Fri, 27 Jan 2023 21:01:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EE4333858D38 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 4A29021F57 for ; Fri, 27 Jan 2023 21:01:49 +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 3682E138E3 for ; Fri, 27 Jan 2023 21:01:49 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id bgLpC7071GMeBgAAMHmgww (envelope-from ) for ; Fri, 27 Jan 2023 21:01:49 +0000 To: gdb-patches@sourceware.org Subject: [pushed] [gdb/testsuite] Simplify gdb.base/unwind-on-each-insn.exp.tcl Date: Fri, 27 Jan 2023 22:01:48 +0100 Message-Id: <20230127210148.16473-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 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 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" Recent commit 1d98e564c97 ("[gdb/testsuite] Add gdb.base/unwind-on-each-insn-{amd64,i386}.exp") broke commit eb015bf86b6 ("[gdb/testsuite] Avoid using .eh_frame in gdb.base/unwind-on-each-insn.exp"), in the sense that gdb.base/unwind-on-each-insn.exp no longer uses -fno-asynchronous-unwind-tables, due to trying to concatenate two lists using: ... lappend srcfile2_flags $nodebug_flags ... which should instead be: ... lappend srcfile2_flags {*}$nodebug_flags ... Fix this by simplifying gdb.base/unwind-on-each-insn.exp.tcl, completely leaving the responsibility to set srcfile_flags and srcfile2_flags to each includer. Tested on x86_64-linux. --- .../gdb.base/unwind-on-each-insn-amd64.exp | 6 ++--- .../gdb.base/unwind-on-each-insn-i386.exp | 6 ++--- .../gdb.base/unwind-on-each-insn.exp | 13 +++++++---- .../gdb.base/unwind-on-each-insn.exp.tcl | 23 +------------------ 4 files changed, 14 insertions(+), 34 deletions(-) base-commit: f6210497fd7ff8f71c1421abb3dacdd4556dd097 diff --git a/gdb/testsuite/gdb.base/unwind-on-each-insn-amd64.exp b/gdb/testsuite/gdb.base/unwind-on-each-insn-amd64.exp index b005715aa56..cec4a2de236 100644 --- a/gdb/testsuite/gdb.base/unwind-on-each-insn-amd64.exp +++ b/gdb/testsuite/gdb.base/unwind-on-each-insn-amd64.exp @@ -17,10 +17,8 @@ require is_x86_64_m64_target -set srcfile_flags {} -set srcfile2_flags {} -set srcfile_debug 1 -set srcfile2_debug 1 +set srcfile_flags {debug} +set srcfile2_flags {debug} if [info exists COMPILE] { standard_testfile unwind-on-each-insn.c unwind-on-each-insn-foo.c diff --git a/gdb/testsuite/gdb.base/unwind-on-each-insn-i386.exp b/gdb/testsuite/gdb.base/unwind-on-each-insn-i386.exp index d4d57eb57a9..5e9f60902e7 100644 --- a/gdb/testsuite/gdb.base/unwind-on-each-insn-i386.exp +++ b/gdb/testsuite/gdb.base/unwind-on-each-insn-i386.exp @@ -17,10 +17,8 @@ require is_x86_like_target -set srcfile_flags {} -set srcfile2_flags {} -set srcfile_debug 1 -set srcfile2_debug 1 +set srcfile_flags {debug} +set srcfile2_flags {debug} if [info exists COMPILE] { standard_testfile unwind-on-each-insn.c unwind-on-each-insn-foo.c diff --git a/gdb/testsuite/gdb.base/unwind-on-each-insn.exp b/gdb/testsuite/gdb.base/unwind-on-each-insn.exp index e86565a03f6..2fc6d30b0f3 100644 --- a/gdb/testsuite/gdb.base/unwind-on-each-insn.exp +++ b/gdb/testsuite/gdb.base/unwind-on-each-insn.exp @@ -15,9 +15,14 @@ standard_testfile .c -foo.c -set srcfile_flags {} -set srcfile2_flags {} -set srcfile_debug 1 -set srcfile2_debug 0 +set srcfile_flags {debug} +set srcfile2_flags {nodebug} + +# Make sure that we don't use .eh_frame info, by not generating it, +# using -fno-asynchronous-unwind-tables, if supported. +if { [gdb_can_simple_compile fno-asynchronous-unwind-tables \ + { void foo () { } } object -fno-asynchronous-unwind-tables] } { + lappend srcfile2_flags additional_flags=-fno-asynchronous-unwind-tables +} source $srcdir/$subdir/unwind-on-each-insn.exp.tcl diff --git a/gdb/testsuite/gdb.base/unwind-on-each-insn.exp.tcl b/gdb/testsuite/gdb.base/unwind-on-each-insn.exp.tcl index 45ed91a3986..1b6840e3102 100644 --- a/gdb/testsuite/gdb.base/unwind-on-each-insn.exp.tcl +++ b/gdb/testsuite/gdb.base/unwind-on-each-insn.exp.tcl @@ -23,29 +23,8 @@ # and that the previous stack-pointer value, and frame base address # value, can be calculated correctly. -set debug_flags {debug} -set nodebug_flags {nodebug} - -# Make sure that we don't use .eh_frame info, by not generating it, -# using -fno-asynchronous-unwind-tables, if supported. -if { [gdb_can_simple_compile fno-asynchronous-unwind-tables \ - { void foo () { } } object -fno-asynchronous-unwind-tables] } { - lappend nodebug_flags additional_flags=-fno-asynchronous-unwind-tables -} - -if { $srcfile_debug } { - lappend srcfile_flags $debug_flags -} else { - lappend srcfile_flags $nodebug_flags -} -if { $srcfile2_debug } { - lappend srcfile2_flags $debug_flags -} else { - lappend srcfile2_flags $nodebug_flags -} - if {[prepare_for_testing_full "failed to prepare" \ - [list ${testfile} $debug_flags \ + [list ${testfile} {debug} \ $srcfile $srcfile_flags $srcfile2 $srcfile2_flags]]} { return -1 }