From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2205) id 40D3A3858C1F; Fri, 27 Jan 2023 21:01:20 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 40D3A3858C1F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1674853280; bh=WWZ/9tqb9rX4crYuLMXNxnpBz1E4h+39Cy7mHu4/P8k=; h=From:To:Subject:Date:From; b=aIOX6Sc9EhytDTF71G4ZjmchZQyLRo47KudWKrhDOUsoXgNV/N3pc4nmUgF6oIPQ6 4bF2DLqs1VSoNuZFUfwkO+YoFNn0zkNTjNcf901n+Q9oJ4i1PHtn8KAI28+m63QRxh taoXXA0JM2qqWxR/WuW/k9CcNyrZzRal0Ci5pMPk= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom de Vries To: gdb-cvs@sourceware.org Subject: [binutils-gdb] [gdb/testsuite] Simplify gdb.base/unwind-on-each-insn.exp.tcl X-Act-Checkin: binutils-gdb X-Git-Author: Tom de Vries X-Git-Refname: refs/heads/master X-Git-Oldrev: f6210497fd7ff8f71c1421abb3dacdd4556dd097 X-Git-Newrev: d9195131530370f56e78a2b084928c11da536d9e Message-Id: <20230127210120.40D3A3858C1F@sourceware.org> Date: Fri, 27 Jan 2023 21:01:20 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Dd91951315303= 70f56e78a2b084928c11da536d9e commit d9195131530370f56e78a2b084928c11da536d9e Author: Tom de Vries Date: Fri Jan 27 22:01:16 2023 +0100 [gdb/testsuite] Simplify gdb.base/unwind-on-each-insn.exp.tcl =20 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 ... =20 Fix this by simplifying gdb.base/unwind-on-each-insn.exp.tcl, completely leaving the responsibility to set srcfile_flags and srcfile2_flags to e= ach includer. =20 Tested on x86_64-linux. Diff: --- .../gdb.base/unwind-on-each-insn-amd64.exp | 6 ++---- .../gdb.base/unwind-on-each-insn-i386.exp | 6 ++---- gdb/testsuite/gdb.base/unwind-on-each-insn.exp | 13 ++++++++---- gdb/testsuite/gdb.base/unwind-on-each-insn.exp.tcl | 23 +-----------------= ---- 4 files changed, 14 insertions(+), 34 deletions(-) diff --git a/gdb/testsuite/gdb.base/unwind-on-each-insn-amd64.exp b/gdb/tes= tsuite/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 @@ =20 require is_x86_64_m64_target =20 -set srcfile_flags {} -set srcfile2_flags {} -set srcfile_debug 1 -set srcfile2_debug 1 +set srcfile_flags {debug} +set srcfile2_flags {debug} =20 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/test= suite/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 @@ =20 require is_x86_like_target =20 -set srcfile_flags {} -set srcfile2_flags {} -set srcfile_debug 1 -set srcfile2_debug 1 +set srcfile_flags {debug} +set srcfile2_flags {debug} =20 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 @@ =20 standard_testfile .c -foo.c =20 -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=3D-fno-asynchronous-unwind-tab= les +} =20 source $srcdir/$subdir/unwind-on-each-insn.exp.tcl diff --git a/gdb/testsuite/gdb.base/unwind-on-each-insn.exp.tcl b/gdb/tests= uite/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. =20 -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=3D-fno-asynchronous-unwind-tabl= es -} - -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 }