From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2126) id 117473858425; Fri, 13 Jan 2023 20:37:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 117473858425 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1673642234; bh=BY71X9S6L0AHoB3VHBLPDlMTgIipEYtJXRv4wKie8IQ=; h=From:To:Subject:Date:From; b=JeBvRm4t0Y/MNxonMBaKLLPuD/RsLGrf4iSqxuVbfcSGAy2+mrJfxZL0AnEL5xW9i FELwWtiSgyzyEWAaUpzk/ZmzULDWTorGB2P14MHbLZKrHWhxPpmvsh3AyFZIhLtBiw mRs7+tpjCc0Pf59VE1iyJaE78mPP2OWEZdCiYA/4= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom Tromey To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Use require gdb_trace_common_supports_arch X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: f40c0f9cab7c24ca49615ca5a6efb51b85fcc82c X-Git-Newrev: fbee47e0b58b8f948d56b113cb48e1b7c884b980 Message-Id: <20230113203714.117473858425@sourceware.org> Date: Fri, 13 Jan 2023 20:37:14 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Dfbee47e0b58b= 8f948d56b113cb48e1b7c884b980 commit fbee47e0b58b8f948d56b113cb48e1b7c884b980 Author: Tom Tromey Date: Thu Dec 15 16:15:13 2022 -0700 Use require gdb_trace_common_supports_arch =20 This changes some tests to use "require gdb_trace_common_supports_arch". Diff: --- gdb/testsuite/gdb.trace/actions-changed.exp | 5 +---- gdb/testsuite/gdb.trace/actions.exp | 5 +---- gdb/testsuite/gdb.trace/ax.exp | 5 +---- gdb/testsuite/gdb.trace/backtrace.exp | 5 +---- gdb/testsuite/gdb.trace/change-loc.exp | 5 +---- gdb/testsuite/gdb.trace/deltrace.exp | 5 +---- gdb/testsuite/gdb.trace/ftrace-lock.exp | 5 +---- gdb/testsuite/gdb.trace/ftrace.exp | 5 +---- gdb/testsuite/gdb.trace/infotrace.exp | 5 +---- gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp | 5 +---- gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp | 5 +---- gdb/testsuite/gdb.trace/mi-tsv-changed.exp | 5 +---- gdb/testsuite/gdb.trace/packetlen.exp | 5 +---- gdb/testsuite/gdb.trace/passc-dyn.exp | 5 +---- gdb/testsuite/gdb.trace/passcount.exp | 5 +---- gdb/testsuite/gdb.trace/pending.exp | 5 +---- gdb/testsuite/gdb.trace/report.exp | 5 +---- gdb/testsuite/gdb.trace/save-trace.exp | 5 +---- gdb/testsuite/gdb.trace/tfind.exp | 5 +---- gdb/testsuite/gdb.trace/trace-break.exp | 5 +---- gdb/testsuite/gdb.trace/trace-condition.exp | 5 +---- gdb/testsuite/gdb.trace/trace-enable-disable.exp | 5 +---- gdb/testsuite/gdb.trace/trace-mt.exp | 5 +---- gdb/testsuite/gdb.trace/tracecmd.exp | 5 +---- gdb/testsuite/gdb.trace/tstatus.exp | 5 +---- gdb/testsuite/gdb.trace/tsv.exp | 5 +---- gdb/testsuite/gdb.trace/while-dyn.exp | 5 +---- gdb/testsuite/gdb.trace/while-stepping.exp | 5 +---- 28 files changed, 28 insertions(+), 112 deletions(-) diff --git a/gdb/testsuite/gdb.trace/actions-changed.exp b/gdb/testsuite/gd= b.trace/actions-changed.exp index 40563d91989..0c1542f82c8 100644 --- a/gdb/testsuite/gdb.trace/actions-changed.exp +++ b/gdb/testsuite/gdb.trace/actions-changed.exp @@ -17,10 +17,7 @@ load_lib trace-support.exp =20 standard_testfile =20 -if ![gdb_trace_common_supports_arch] { - unsupported "no trace-common.h support for arch" - return -1 -} +require gdb_trace_common_supports_arch =20 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 diff --git a/gdb/testsuite/gdb.trace/actions.exp b/gdb/testsuite/gdb.trace/= actions.exp index e2254e8f48d..cf7efbbd4fd 100644 --- a/gdb/testsuite/gdb.trace/actions.exp +++ b/gdb/testsuite/gdb.trace/actions.exp @@ -22,10 +22,7 @@ gdb_exit gdb_start =20 standard_testfile -if ![gdb_trace_common_supports_arch] { - unsupported "no trace-common.h support for arch" - return -1 -} +require gdb_trace_common_supports_arch if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ executable {debug nowarnings}] !=3D "" } { untested "failed to compile" diff --git a/gdb/testsuite/gdb.trace/ax.exp b/gdb/testsuite/gdb.trace/ax.exp index 2c9d3db787c..9dee743c8dd 100644 --- a/gdb/testsuite/gdb.trace/ax.exp +++ b/gdb/testsuite/gdb.trace/ax.exp @@ -25,10 +25,7 @@ gdb_exit gdb_start standard_testfile actions.c =20 -if ![gdb_trace_common_supports_arch] { - unsupported "no trace-common.h support for arch" - return -1 -} +require gdb_trace_common_supports_arch =20 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ executable {debug nowarnings}] !=3D "" } { diff --git a/gdb/testsuite/gdb.trace/backtrace.exp b/gdb/testsuite/gdb.trac= e/backtrace.exp index 08445b13bef..5462267f700 100644 --- a/gdb/testsuite/gdb.trace/backtrace.exp +++ b/gdb/testsuite/gdb.trace/backtrace.exp @@ -21,10 +21,7 @@ standard_testfile actions.c set executable $testfile set expfile $testfile.exp =20 -if ![gdb_trace_common_supports_arch] { - unsupported "no trace-common.h support for arch" - return -1 -} +require gdb_trace_common_supports_arch =20 if [prepare_for_testing "failed to prepare" $executable $srcfile \ [list debug nowarnings nopie]] { diff --git a/gdb/testsuite/gdb.trace/change-loc.exp b/gdb/testsuite/gdb.tra= ce/change-loc.exp index 75d381db3e9..2bab45da37e 100644 --- a/gdb/testsuite/gdb.trace/change-loc.exp +++ b/gdb/testsuite/gdb.trace/change-loc.exp @@ -16,10 +16,7 @@ load_lib "trace-support.exp" =20 require !skip_shlib_tests =20 -if ![gdb_trace_common_supports_arch] { - unsupported "no trace-common.h support for arch" - return -1 -} +require gdb_trace_common_supports_arch =20 standard_testfile set libfile1 "change-loc-1" diff --git a/gdb/testsuite/gdb.trace/deltrace.exp b/gdb/testsuite/gdb.trace= /deltrace.exp index 876a90fc1c2..cfcb81e8c91 100644 --- a/gdb/testsuite/gdb.trace/deltrace.exp +++ b/gdb/testsuite/gdb.trace/deltrace.exp @@ -23,10 +23,7 @@ gdb_start =20 standard_testfile actions.c =20 -if ![gdb_trace_common_supports_arch] { - unsupported "no trace-common.h support for arch" - return -1 -} +require gdb_trace_common_supports_arch =20 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ executable {debug nowarnings}] !=3D "" } { diff --git a/gdb/testsuite/gdb.trace/ftrace-lock.exp b/gdb/testsuite/gdb.tr= ace/ftrace-lock.exp index e5e8638b306..92374c9fdc7 100644 --- a/gdb/testsuite/gdb.trace/ftrace-lock.exp +++ b/gdb/testsuite/gdb.trace/ftrace-lock.exp @@ -31,10 +31,7 @@ set options [list debug [gdb_target_symbol_prefix_flags]= \ additional_flags=3D-DNUM_THREADS=3D$NUM_THREADS] =20 # Check that the target supports trace. -if ![gdb_trace_common_supports_arch] { - unsupported "no trace-common.h support for arch" - return -1 -} +require gdb_trace_common_supports_arch if { [gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable = $options] !=3D "" } { untested "failed to compile" return -1 diff --git a/gdb/testsuite/gdb.trace/ftrace.exp b/gdb/testsuite/gdb.trace/f= trace.exp index bab97cbe605..7d7d684f8af 100644 --- a/gdb/testsuite/gdb.trace/ftrace.exp +++ b/gdb/testsuite/gdb.trace/ftrace.exp @@ -23,10 +23,7 @@ set expfile $testfile.exp # Some targets have leading underscores on assembly symbols. set additional_flags [gdb_target_symbol_prefix_flags] =20 -if ![gdb_trace_common_supports_arch] { - unsupported "no trace-common.h support for arch" - return -1 -} +require gdb_trace_common_supports_arch =20 if [prepare_for_testing "failed to prepare" $executable $srcfile \ [list debug $additional_flags]] { diff --git a/gdb/testsuite/gdb.trace/infotrace.exp b/gdb/testsuite/gdb.trac= e/infotrace.exp index 3b779ba90c7..1252b30c0f5 100644 --- a/gdb/testsuite/gdb.trace/infotrace.exp +++ b/gdb/testsuite/gdb.trace/infotrace.exp @@ -23,10 +23,7 @@ gdb_start =20 standard_testfile actions.c =20 -if ![gdb_trace_common_supports_arch] { - unsupported "no trace-common.h support for arch" - return -1 -} +require gdb_trace_common_supports_arch =20 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ executable {debug nowarnings}] !=3D "" } { diff --git a/gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp b/gdb/tes= tsuite/gdb.trace/mi-trace-frame-collected.exp index ab66b3ead23..f87a6cf5dde 100644 --- a/gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp +++ b/gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp @@ -17,10 +17,7 @@ load_lib trace-support.exp =20 standard_testfile actions.c =20 -if ![gdb_trace_common_supports_arch] { - unsupported "no trace-common.h support for arch" - return -1 -} +require gdb_trace_common_supports_arch =20 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debu= g}] } { return -1 diff --git a/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp b/gdb/testsu= ite/gdb.trace/mi-tracepoint-changed.exp index 1ea8e728fb9..f6b12b59eba 100644 --- a/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp +++ b/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp @@ -16,10 +16,7 @@ load_lib trace-support.exp =20 require !skip_shlib_tests -if ![gdb_trace_common_supports_arch] { - unsupported "no trace-common.h support for arch" - return -1 -} +require gdb_trace_common_supports_arch =20 standard_testfile pending.c set libfile1 "pendshr1" diff --git a/gdb/testsuite/gdb.trace/mi-tsv-changed.exp b/gdb/testsuite/gdb= .trace/mi-tsv-changed.exp index 2deb9885f9c..57bedd686f6 100644 --- a/gdb/testsuite/gdb.trace/mi-tsv-changed.exp +++ b/gdb/testsuite/gdb.trace/mi-tsv-changed.exp @@ -18,10 +18,7 @@ load_lib mi-support.exp =20 standard_testfile actions.c =20 -if ![gdb_trace_common_supports_arch] { - unsupported "no trace-common.h support for arch" - return -1 -} +require gdb_trace_common_supports_arch =20 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ executable {debug nowarnings}] !=3D "" } { diff --git a/gdb/testsuite/gdb.trace/packetlen.exp b/gdb/testsuite/gdb.trac= e/packetlen.exp index f4e0005b047..31686bcb3bb 100644 --- a/gdb/testsuite/gdb.trace/packetlen.exp +++ b/gdb/testsuite/gdb.trace/packetlen.exp @@ -22,10 +22,7 @@ gdb_exit gdb_start =20 standard_testfile actions.c -if ![gdb_trace_common_supports_arch] { - unsupported "no trace-common.h support for arch" - return -1 -} +require gdb_trace_common_supports_arch if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ executable {debug nowarnings}] !=3D "" } { untested "failed to compile" diff --git a/gdb/testsuite/gdb.trace/passc-dyn.exp b/gdb/testsuite/gdb.trac= e/passc-dyn.exp index 78c5f070803..c005c79053b 100644 --- a/gdb/testsuite/gdb.trace/passc-dyn.exp +++ b/gdb/testsuite/gdb.trace/passc-dyn.exp @@ -21,10 +21,7 @@ load_lib "trace-support.exp" gdb_exit gdb_start standard_testfile actions.c -if ![gdb_trace_common_supports_arch] { - unsupported "no trace-common.h support for arch" - return -1 -} +require gdb_trace_common_supports_arch if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ executable {debug nowarnings}] !=3D "" } { untested "failed to compile" diff --git a/gdb/testsuite/gdb.trace/passcount.exp b/gdb/testsuite/gdb.trac= e/passcount.exp index 5aa8f48baee..3f711496083 100644 --- a/gdb/testsuite/gdb.trace/passcount.exp +++ b/gdb/testsuite/gdb.trace/passcount.exp @@ -21,10 +21,7 @@ load_lib "trace-support.exp" gdb_exit gdb_start standard_testfile actions.c -if ![gdb_trace_common_supports_arch] { - unsupported "no trace-common.h support for arch" - return -1 -} +require gdb_trace_common_supports_arch if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ executable {debug nowarnings}] !=3D "" } { untested "failed to compile" diff --git a/gdb/testsuite/gdb.trace/pending.exp b/gdb/testsuite/gdb.trace/= pending.exp index deaaeef1926..8778c1f9bcf 100644 --- a/gdb/testsuite/gdb.trace/pending.exp +++ b/gdb/testsuite/gdb.trace/pending.exp @@ -16,10 +16,7 @@ load_lib "trace-support.exp" =20 require !skip_shlib_tests =20 -if ![gdb_trace_common_supports_arch] { - unsupported "no trace-common.h support for arch" - return -1 -} +require gdb_trace_common_supports_arch =20 standard_testfile set libfile1 "pendshr1" diff --git a/gdb/testsuite/gdb.trace/report.exp b/gdb/testsuite/gdb.trace/r= eport.exp index 76b74a97891..33bccaa1a6a 100644 --- a/gdb/testsuite/gdb.trace/report.exp +++ b/gdb/testsuite/gdb.trace/report.exp @@ -22,10 +22,7 @@ gdb_exit gdb_start =20 standard_testfile actions.c -if ![gdb_trace_common_supports_arch] { - unsupported "no trace-common.h support for arch" - return -1 -} +require gdb_trace_common_supports_arch if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ executable {debug nowarnings nopie}] !=3D "" } { untested "failed to compile" diff --git a/gdb/testsuite/gdb.trace/save-trace.exp b/gdb/testsuite/gdb.tra= ce/save-trace.exp index 76c208cd59e..71a094a25dc 100644 --- a/gdb/testsuite/gdb.trace/save-trace.exp +++ b/gdb/testsuite/gdb.trace/save-trace.exp @@ -22,10 +22,7 @@ gdb_exit gdb_start =20 standard_testfile actions.c -if ![gdb_trace_common_supports_arch] { - unsupported "no trace-common.h support for arch" - return -1 -} +require gdb_trace_common_supports_arch if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ executable {debug nowarnings}] !=3D "" } { untested "failed to compile" diff --git a/gdb/testsuite/gdb.trace/tfind.exp b/gdb/testsuite/gdb.trace/tf= ind.exp index fc04a0560c2..4579e85ed86 100644 --- a/gdb/testsuite/gdb.trace/tfind.exp +++ b/gdb/testsuite/gdb.trace/tfind.exp @@ -23,10 +23,7 @@ gdb_start =20 standard_testfile actions.c =20 -if ![gdb_trace_common_supports_arch] { - unsupported "no trace-common.h support for arch" - return -1 -} +require gdb_trace_common_supports_arch =20 if { [gdb_compile "$srcdir/$subdir/$srcfile" "$binfile" \ executable {debug nowarnings nopie}] !=3D "" } { diff --git a/gdb/testsuite/gdb.trace/trace-break.exp b/gdb/testsuite/gdb.tr= ace/trace-break.exp index 3630aae9d69..6e5415cbe35 100644 --- a/gdb/testsuite/gdb.trace/trace-break.exp +++ b/gdb/testsuite/gdb.trace/trace-break.exp @@ -21,10 +21,7 @@ set expfile $testfile.exp # Some targets have leading underscores on assembly symbols. set additional_flags [gdb_target_symbol_prefix_flags] =20 -if ![gdb_trace_common_supports_arch] { - unsupported "no trace-common.h support for arch" - return -1 -} +require gdb_trace_common_supports_arch =20 if [prepare_for_testing "failed to prepare" $executable $srcfile \ [list debug $additional_flags]] { diff --git a/gdb/testsuite/gdb.trace/trace-condition.exp b/gdb/testsuite/gd= b.trace/trace-condition.exp index d6f7fc0302a..d49b792143e 100644 --- a/gdb/testsuite/gdb.trace/trace-condition.exp +++ b/gdb/testsuite/gdb.trace/trace-condition.exp @@ -23,10 +23,7 @@ set expfile $testfile.exp # Some targets have leading underscores on assembly symbols. set additional_flags [gdb_target_symbol_prefix_flags] =20 -if ![gdb_trace_common_supports_arch] { - unsupported "no trace-common.h support for arch" - return -1 -} +require gdb_trace_common_supports_arch =20 if [prepare_for_testing "failed to prepare" $executable $srcfile \ [list debug $additional_flags]] { diff --git a/gdb/testsuite/gdb.trace/trace-enable-disable.exp b/gdb/testsui= te/gdb.trace/trace-enable-disable.exp index e42f6f75225..76b5b9a4d74 100644 --- a/gdb/testsuite/gdb.trace/trace-enable-disable.exp +++ b/gdb/testsuite/gdb.trace/trace-enable-disable.exp @@ -24,10 +24,7 @@ set expfile $testfile.exp set options [list debug [gdb_target_symbol_prefix_flags]] =20 # Check that the target supports trace. -if ![gdb_trace_common_supports_arch] { - unsupported "no trace-common.h support for arch" - return -1 -} +require gdb_trace_common_supports_arch if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile executable $options]= !=3D "" } { untested "failed to compile" return -1 diff --git a/gdb/testsuite/gdb.trace/trace-mt.exp b/gdb/testsuite/gdb.trace= /trace-mt.exp index e57cad8090c..0fc2f0069c2 100644 --- a/gdb/testsuite/gdb.trace/trace-mt.exp +++ b/gdb/testsuite/gdb.trace/trace-mt.exp @@ -21,10 +21,7 @@ set expfile $testfile.exp # Some targets have leading underscores on assembly symbols. set additional_flags [gdb_target_symbol_prefix_flags] =20 -if ![gdb_trace_common_supports_arch] { - unsupported "no trace-common.h support for arch" - return -1 -} +require gdb_trace_common_supports_arch =20 if { [gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile \ executable [list debug $additional_flags] ] !=3D "" } { diff --git a/gdb/testsuite/gdb.trace/tracecmd.exp b/gdb/testsuite/gdb.trace= /tracecmd.exp index f94b14e348c..7ce6f59e2c9 100644 --- a/gdb/testsuite/gdb.trace/tracecmd.exp +++ b/gdb/testsuite/gdb.trace/tracecmd.exp @@ -21,10 +21,7 @@ load_lib "trace-support.exp" gdb_exit gdb_start standard_testfile actions.c -if ![gdb_trace_common_supports_arch] { - unsupported "no trace-common.h support for arch" - return -1 -} +require gdb_trace_common_supports_arch if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ executable {debug nowarnings}] !=3D "" } { untested "failed to compile" diff --git a/gdb/testsuite/gdb.trace/tstatus.exp b/gdb/testsuite/gdb.trace/= tstatus.exp index 8b55a7492f7..a847a036941 100644 --- a/gdb/testsuite/gdb.trace/tstatus.exp +++ b/gdb/testsuite/gdb.trace/tstatus.exp @@ -18,10 +18,7 @@ standard_testfile actions.c set executable $testfile set expfile tstatus.exp =20 -if ![gdb_trace_common_supports_arch] { - unsupported "no trace-common.h support for arch" - return -1 -} +require gdb_trace_common_supports_arch =20 if [prepare_for_testing "failed to prepare" $executable $srcfile \ [list debug]] { diff --git a/gdb/testsuite/gdb.trace/tsv.exp b/gdb/testsuite/gdb.trace/tsv.= exp index a104c1b5498..ea7ad55143a 100644 --- a/gdb/testsuite/gdb.trace/tsv.exp +++ b/gdb/testsuite/gdb.trace/tsv.exp @@ -19,10 +19,7 @@ load_lib "trace-support.exp" gdb_exit gdb_start standard_testfile actions.c -if ![gdb_trace_common_supports_arch] { - unsupported "no trace-common.h support for arch" - return -1 -} +require gdb_trace_common_supports_arch if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ executable {debug nowarnings}] !=3D "" } { untested "failed to compile" diff --git a/gdb/testsuite/gdb.trace/while-dyn.exp b/gdb/testsuite/gdb.trac= e/while-dyn.exp index e8583156807..960a95926b7 100644 --- a/gdb/testsuite/gdb.trace/while-dyn.exp +++ b/gdb/testsuite/gdb.trace/while-dyn.exp @@ -23,10 +23,7 @@ gdb_start =20 standard_testfile actions.c set executable $testfile -if ![gdb_trace_common_supports_arch] { - unsupported "no trace-common.h support for arch" - return -1 -} +require gdb_trace_common_supports_arch if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ executable {debug nowarnings}] !=3D "" } { untested "failed to compile" diff --git a/gdb/testsuite/gdb.trace/while-stepping.exp b/gdb/testsuite/gdb= .trace/while-stepping.exp index 583bba15d2c..64c0c9ed84f 100644 --- a/gdb/testsuite/gdb.trace/while-stepping.exp +++ b/gdb/testsuite/gdb.trace/while-stepping.exp @@ -22,10 +22,7 @@ gdb_exit gdb_start =20 standard_testfile actions.c -if ![gdb_trace_common_supports_arch] { - unsupported "no trace-common.h support for arch" - return -1 -} +require gdb_trace_common_supports_arch if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" $binfile \ executable {debug nowarnings}] !=3D "" } { untested "failed to compile"