From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2126) id BADB43858C39; Fri, 13 Jan 2023 20:35:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BADB43858C39 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1673642142; bh=gcQqjwN+5xu4aRvEHJkNeLStyE/GFhf1xUnzadPa29s=; h=From:To:Subject:Date:From; b=PjDFLm2X596Xsg0nXGgw6ZvYkuyd0t/LVsLP06kvSqU8ZCzn1UloxAhfxhv4iHsqo hnMP9YWHfAg7xOJ534nQKngRgSo880yLwFvZQpuM2/OS48Qzrji7jjVUoog/a4avuQ cJ1WJCKcb25YslqUPdChinyLDhwcrgiNqaC7WGYc= 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 !skip_btrace_tests X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: ede8c648c4f4e28e02cd6b54cee0f6bd3f13e161 X-Git-Newrev: 6848695de293c4f8f33bcab968f729702fdb0b2d Message-Id: <20230113203542.BADB43858C39@sourceware.org> Date: Fri, 13 Jan 2023 20:35:42 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D6848695de293= c4f8f33bcab968f729702fdb0b2d commit 6848695de293c4f8f33bcab968f729702fdb0b2d Author: Tom Tromey Date: Wed Dec 14 09:42:37 2022 -0700 Use require !skip_btrace_tests =20 This changes some tests to use "require !skip_btrace_tests". Diff: --- gdb/testsuite/gdb.btrace/buffer-size.exp | 5 +---- gdb/testsuite/gdb.btrace/data.exp | 5 +---- gdb/testsuite/gdb.btrace/delta.exp | 5 +---- gdb/testsuite/gdb.btrace/enable-new-thread.exp | 5 +---- gdb/testsuite/gdb.btrace/enable-running.exp | 5 +---- gdb/testsuite/gdb.btrace/enable.exp | 5 +---- gdb/testsuite/gdb.btrace/exception.exp | 5 +---- gdb/testsuite/gdb.btrace/function_call_history.exp | 5 +---- gdb/testsuite/gdb.btrace/gcore.exp | 5 +---- gdb/testsuite/gdb.btrace/instruction_history.exp | 5 +---- gdb/testsuite/gdb.btrace/multi-inferior.exp | 5 +---- gdb/testsuite/gdb.btrace/multi-thread-step.exp | 5 +---- gdb/testsuite/gdb.btrace/nohist.exp | 5 +---- gdb/testsuite/gdb.btrace/non-stop.exp | 5 +---- gdb/testsuite/gdb.btrace/reconnect.exp | 5 +---- gdb/testsuite/gdb.btrace/record_goto-step.exp | 5 +---- gdb/testsuite/gdb.btrace/record_goto.exp | 5 +---- gdb/testsuite/gdb.btrace/rn-dl-bind.exp | 5 +---- gdb/testsuite/gdb.btrace/segv.exp | 5 +---- gdb/testsuite/gdb.btrace/step.exp | 5 +---- gdb/testsuite/gdb.btrace/stepi.exp | 5 +---- gdb/testsuite/gdb.btrace/tailcall-only.exp | 5 +---- gdb/testsuite/gdb.btrace/tailcall.exp | 5 +---- gdb/testsuite/gdb.btrace/unknown_functions.exp | 5 +---- gdb/testsuite/gdb.btrace/vdso.exp | 5 +---- gdb/testsuite/gdb.python/py-record-btrace-threads.exp | 5 +---- gdb/testsuite/gdb.python/py-record-btrace.exp | 5 +---- 27 files changed, 27 insertions(+), 108 deletions(-) diff --git a/gdb/testsuite/gdb.btrace/buffer-size.exp b/gdb/testsuite/gdb.b= trace/buffer-size.exp index 6790323f854..d0a9086604f 100644 --- a/gdb/testsuite/gdb.btrace/buffer-size.exp +++ b/gdb/testsuite/gdb.btrace/buffer-size.exp @@ -17,10 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . =20 -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests =20 standard_testfile record_goto.c if [prepare_for_testing "failed to prepare" $testfile $srcfile] { diff --git a/gdb/testsuite/gdb.btrace/data.exp b/gdb/testsuite/gdb.btrace/d= ata.exp index 77248beb1a2..8be2a4ccdea 100644 --- a/gdb/testsuite/gdb.btrace/data.exp +++ b/gdb/testsuite/gdb.btrace/data.exp @@ -17,10 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . =20 -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests =20 standard_testfile if [prepare_for_testing "failed to prepare" $testfile $srcfile] { diff --git a/gdb/testsuite/gdb.btrace/delta.exp b/gdb/testsuite/gdb.btrace/= delta.exp index e21cbfb87eb..e4307e15a5b 100644 --- a/gdb/testsuite/gdb.btrace/delta.exp +++ b/gdb/testsuite/gdb.btrace/delta.exp @@ -17,10 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . =20 -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests =20 standard_testfile record_goto.c if [prepare_for_testing "failed to prepare" $testfile $srcfile] { diff --git a/gdb/testsuite/gdb.btrace/enable-new-thread.exp b/gdb/testsuite= /gdb.btrace/enable-new-thread.exp index fb6b9ca3dd2..22cc33f142f 100644 --- a/gdb/testsuite/gdb.btrace/enable-new-thread.exp +++ b/gdb/testsuite/gdb.btrace/enable-new-thread.exp @@ -17,10 +17,7 @@ =20 # Test that new threads of recorded inferiors also get recorded. =20 -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests =20 standard_testfile if [prepare_for_testing "failed to prepare" $testfile $srcfile {debug pthr= eads}] { diff --git a/gdb/testsuite/gdb.btrace/enable-running.exp b/gdb/testsuite/gd= b.btrace/enable-running.exp index 2c24b8d8398..6e626e3a053 100644 --- a/gdb/testsuite/gdb.btrace/enable-running.exp +++ b/gdb/testsuite/gdb.btrace/enable-running.exp @@ -15,10 +15,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . =20 -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests =20 standard_testfile if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" "$binfile" executable= {debug}] !=3D "" } { diff --git a/gdb/testsuite/gdb.btrace/enable.exp b/gdb/testsuite/gdb.btrace= /enable.exp index 1c29131e97b..bb57f7b8a74 100644 --- a/gdb/testsuite/gdb.btrace/enable.exp +++ b/gdb/testsuite/gdb.btrace/enable.exp @@ -17,10 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . =20 -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests =20 # start fresh - without an executable gdb_exit diff --git a/gdb/testsuite/gdb.btrace/exception.exp b/gdb/testsuite/gdb.btr= ace/exception.exp index 731ebe1cf90..e84ff14d193 100755 --- a/gdb/testsuite/gdb.btrace/exception.exp +++ b/gdb/testsuite/gdb.btrace/exception.exp @@ -17,10 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . =20 -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests =20 # We expect a specific function call history. This gets messed up with # PIE on 32-bit. diff --git a/gdb/testsuite/gdb.btrace/function_call_history.exp b/gdb/tests= uite/gdb.btrace/function_call_history.exp index 562412f121c..fd35d762796 100644 --- a/gdb/testsuite/gdb.btrace/function_call_history.exp +++ b/gdb/testsuite/gdb.btrace/function_call_history.exp @@ -17,10 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . =20 -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests =20 # We expect a specific function call history. This gets messed up with # PIE on 32-bit. diff --git a/gdb/testsuite/gdb.btrace/gcore.exp b/gdb/testsuite/gdb.btrace/= gcore.exp index 4b056c0fee0..1e98860aee3 100644 --- a/gdb/testsuite/gdb.btrace/gcore.exp +++ b/gdb/testsuite/gdb.btrace/gcore.exp @@ -17,10 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . =20 -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests =20 standard_testfile record_goto.c if [prepare_for_testing "failed to prepare" $testfile $srcfile] { diff --git a/gdb/testsuite/gdb.btrace/instruction_history.exp b/gdb/testsui= te/gdb.btrace/instruction_history.exp index b9043b36eac..0e525c73cb7 100644 --- a/gdb/testsuite/gdb.btrace/instruction_history.exp +++ b/gdb/testsuite/gdb.btrace/instruction_history.exp @@ -17,10 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . =20 -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests =20 standard_testfile .c .S if [prepare_for_testing "failed to prepare" $testfile "$srcfile $srcfile2"= {debug}] { diff --git a/gdb/testsuite/gdb.btrace/multi-inferior.exp b/gdb/testsuite/gd= b.btrace/multi-inferior.exp index 87bf029e4be..727161e4dbd 100644 --- a/gdb/testsuite/gdb.btrace/multi-inferior.exp +++ b/gdb/testsuite/gdb.btrace/multi-inferior.exp @@ -22,10 +22,7 @@ # # Each inferior can be recorded separately. =20 -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests =20 if { [use_gdb_stub] } { unsupported "test creates multiple inferiors" diff --git a/gdb/testsuite/gdb.btrace/multi-thread-step.exp b/gdb/testsuite= /gdb.btrace/multi-thread-step.exp index d58b791b4e1..a18734843ae 100644 --- a/gdb/testsuite/gdb.btrace/multi-thread-step.exp +++ b/gdb/testsuite/gdb.btrace/multi-thread-step.exp @@ -17,10 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . =20 -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests =20 standard_testfile if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" "$binfile" executable= {debug}] !=3D "" } { diff --git a/gdb/testsuite/gdb.btrace/nohist.exp b/gdb/testsuite/gdb.btrace= /nohist.exp index 60710132431..0875b8a6e22 100644 --- a/gdb/testsuite/gdb.btrace/nohist.exp +++ b/gdb/testsuite/gdb.btrace/nohist.exp @@ -17,10 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . =20 -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests =20 standard_testfile record_goto.c if [prepare_for_testing "failed to prepare" $testfile $srcfile] { diff --git a/gdb/testsuite/gdb.btrace/non-stop.exp b/gdb/testsuite/gdb.btra= ce/non-stop.exp index 0cc78e97f16..278064fbac5 100644 --- a/gdb/testsuite/gdb.btrace/non-stop.exp +++ b/gdb/testsuite/gdb.btrace/non-stop.exp @@ -15,10 +15,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . =20 -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests =20 standard_testfile if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" "$binfile" executable= {debug}] !=3D "" } { diff --git a/gdb/testsuite/gdb.btrace/reconnect.exp b/gdb/testsuite/gdb.btr= ace/reconnect.exp index 0adfc1b65fc..868cf1f0680 100644 --- a/gdb/testsuite/gdb.btrace/reconnect.exp +++ b/gdb/testsuite/gdb.btrace/reconnect.exp @@ -19,10 +19,7 @@ =20 load_lib gdbserver-support.exp =20 -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests if { [skip_gdbserver_tests] } { unsupported "target does not support gdbserver" return -1 diff --git a/gdb/testsuite/gdb.btrace/record_goto-step.exp b/gdb/testsuite/= gdb.btrace/record_goto-step.exp index f1a3f00ada9..1f289b47f64 100644 --- a/gdb/testsuite/gdb.btrace/record_goto-step.exp +++ b/gdb/testsuite/gdb.btrace/record_goto-step.exp @@ -17,10 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . =20 -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests =20 standard_testfile record_goto.c if [prepare_for_testing "failed to prepare" $testfile $srcfile] { diff --git a/gdb/testsuite/gdb.btrace/record_goto.exp b/gdb/testsuite/gdb.b= trace/record_goto.exp index ab32a298ce3..dce9ca18c6c 100644 --- a/gdb/testsuite/gdb.btrace/record_goto.exp +++ b/gdb/testsuite/gdb.btrace/record_goto.exp @@ -17,10 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . =20 -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests =20 # The "record goto" command jumps to a specific instruction in the executi= on # trace. To guarantee that we always get the same execution trace, we use diff --git a/gdb/testsuite/gdb.btrace/rn-dl-bind.exp b/gdb/testsuite/gdb.bt= race/rn-dl-bind.exp index c55ff18b003..f61aa936a8d 100644 --- a/gdb/testsuite/gdb.btrace/rn-dl-bind.exp +++ b/gdb/testsuite/gdb.btrace/rn-dl-bind.exp @@ -21,10 +21,7 @@ # Test that we can reverse-next over the dynamic linker's symbol # lookup code. =20 -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests =20 standard_testfile if [prepare_for_testing "failed to prepare" $testfile $srcfile \ diff --git a/gdb/testsuite/gdb.btrace/segv.exp b/gdb/testsuite/gdb.btrace/s= egv.exp index 45b9d1d5b5e..9d256795729 100644 --- a/gdb/testsuite/gdb.btrace/segv.exp +++ b/gdb/testsuite/gdb.btrace/segv.exp @@ -17,10 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . =20 -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests =20 standard_testfile if [prepare_for_testing "failed to prepare" $testfile $srcfile] { diff --git a/gdb/testsuite/gdb.btrace/step.exp b/gdb/testsuite/gdb.btrace/s= tep.exp index 438ff580b55..8ad58d48fdc 100644 --- a/gdb/testsuite/gdb.btrace/step.exp +++ b/gdb/testsuite/gdb.btrace/step.exp @@ -17,10 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . =20 -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests =20 standard_testfile record_goto.c if [prepare_for_testing "failed to prepare" $testfile $srcfile] { diff --git a/gdb/testsuite/gdb.btrace/stepi.exp b/gdb/testsuite/gdb.btrace/= stepi.exp index 06a68d9b1b4..f659d58cf7c 100644 --- a/gdb/testsuite/gdb.btrace/stepi.exp +++ b/gdb/testsuite/gdb.btrace/stepi.exp @@ -17,10 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . =20 -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests =20 # This test is stepping on instruction level. To guarantee that we always # get the same execution trace, we use an assembly source file. diff --git a/gdb/testsuite/gdb.btrace/tailcall-only.exp b/gdb/testsuite/gdb= .btrace/tailcall-only.exp index 081a919b719..16541b2eacf 100644 --- a/gdb/testsuite/gdb.btrace/tailcall-only.exp +++ b/gdb/testsuite/gdb.btrace/tailcall-only.exp @@ -20,10 +20,7 @@ # calls. This used to cause a crash in get_frame_type. # =20 -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests =20 # This test requires the compiler to generate a tail call. To guarantee t= hat # we always get one, we use an assembly source file. diff --git a/gdb/testsuite/gdb.btrace/tailcall.exp b/gdb/testsuite/gdb.btra= ce/tailcall.exp index 028e03fc6f6..f422fbb1b2a 100644 --- a/gdb/testsuite/gdb.btrace/tailcall.exp +++ b/gdb/testsuite/gdb.btrace/tailcall.exp @@ -17,10 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . =20 -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests =20 # This test requires the compiler to generate a tail call. To guarantee t= hat # we always get one, we use an assembly source file. diff --git a/gdb/testsuite/gdb.btrace/unknown_functions.exp b/gdb/testsuite= /gdb.btrace/unknown_functions.exp index 1bfa4dcd873..291d7df5963 100644 --- a/gdb/testsuite/gdb.btrace/unknown_functions.exp +++ b/gdb/testsuite/gdb.btrace/unknown_functions.exp @@ -17,10 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . =20 -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests =20 standard_testfile =20 diff --git a/gdb/testsuite/gdb.btrace/vdso.exp b/gdb/testsuite/gdb.btrace/v= dso.exp index ef2ef2c8e8f..16a7e230786 100644 --- a/gdb/testsuite/gdb.btrace/vdso.exp +++ b/gdb/testsuite/gdb.btrace/vdso.exp @@ -20,10 +20,7 @@ # # Test that we can access the vdso memory during replay for stepping. =20 -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests =20 standard_testfile if [prepare_for_testing "failed to prepare" $testfile $srcfile] { diff --git a/gdb/testsuite/gdb.python/py-record-btrace-threads.exp b/gdb/te= stsuite/gdb.python/py-record-btrace-threads.exp index 53f4a7bba98..ef14edceded 100644 --- a/gdb/testsuite/gdb.python/py-record-btrace-threads.exp +++ b/gdb/testsuite/gdb.python/py-record-btrace-threads.exp @@ -17,10 +17,7 @@ =20 # Skip this test if btrace is disabled. =20 -if { [skip_btrace_tests] } { - untested "skipping btrace tests" - return -1 -} +require !skip_btrace_tests =20 standard_testfile =20 diff --git a/gdb/testsuite/gdb.python/py-record-btrace.exp b/gdb/testsuite/= gdb.python/py-record-btrace.exp index 0d36959464e..38c326f555f 100644 --- a/gdb/testsuite/gdb.python/py-record-btrace.exp +++ b/gdb/testsuite/gdb.python/py-record-btrace.exp @@ -17,10 +17,7 @@ =20 # Skip this test if btrace is disabled. =20 -if { [skip_btrace_tests] } { - untested "skipping btrace tests" - return -1 -} +require !skip_btrace_tests =20 load_lib gdb-python.exp