From 6848695de293c4f8f33bcab968f729702fdb0b2d Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 14 Dec 2022 09:42:37 -0700 Subject: Use require !skip_btrace_tests This changes some tests to use "require !skip_btrace_tests". --- 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.btrace/buffer-size.exp index 6790323..d0a9086 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 . -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests 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/data.exp index 77248be..8be2a4c 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 . -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests 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 e21cbfb..e4307e1 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 . -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests 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 fb6b9ca..22cc33f 100644 --- a/gdb/testsuite/gdb.btrace/enable-new-thread.exp +++ b/gdb/testsuite/gdb.btrace/enable-new-thread.exp @@ -17,10 +17,7 @@ # Test that new threads of recorded inferiors also get recorded. -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests standard_testfile if [prepare_for_testing "failed to prepare" $testfile $srcfile {debug pthreads}] { diff --git a/gdb/testsuite/gdb.btrace/enable-running.exp b/gdb/testsuite/gdb.btrace/enable-running.exp index 2c24b8d..6e626e3 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 . -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests standard_testfile if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" "$binfile" executable {debug}] != "" } { diff --git a/gdb/testsuite/gdb.btrace/enable.exp b/gdb/testsuite/gdb.btrace/enable.exp index 1c29131..bb57f7b 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 . -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests # start fresh - without an executable gdb_exit diff --git a/gdb/testsuite/gdb.btrace/exception.exp b/gdb/testsuite/gdb.btrace/exception.exp index 731ebe1..e84ff14 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 . -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests # 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/testsuite/gdb.btrace/function_call_history.exp index 562412f..fd35d76 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 . -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests # 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 4b056c0..1e98860 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 . -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests 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/testsuite/gdb.btrace/instruction_history.exp index b9043b3..0e525c7 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 . -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests 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/gdb.btrace/multi-inferior.exp index 87bf029..727161e 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. -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests 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 d58b791..a187348 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 . -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests standard_testfile if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" "$binfile" executable {debug}] != "" } { diff --git a/gdb/testsuite/gdb.btrace/nohist.exp b/gdb/testsuite/gdb.btrace/nohist.exp index 6071013..0875b8a 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 . -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests 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.btrace/non-stop.exp index 0cc78e9..278064f 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 . -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests standard_testfile if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" "$binfile" executable {debug}] != "" } { diff --git a/gdb/testsuite/gdb.btrace/reconnect.exp b/gdb/testsuite/gdb.btrace/reconnect.exp index 0adfc1b..868cf1f 100644 --- a/gdb/testsuite/gdb.btrace/reconnect.exp +++ b/gdb/testsuite/gdb.btrace/reconnect.exp @@ -19,10 +19,7 @@ load_lib gdbserver-support.exp -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 f1a3f00..1f289b4 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 . -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests 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.btrace/record_goto.exp index ab32a29..dce9ca1 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 . -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests # The "record goto" command jumps to a specific instruction in the execution # 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.btrace/rn-dl-bind.exp index c55ff18..f61aa93 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. -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests 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/segv.exp index 45b9d1d..9d25679 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 . -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests 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/step.exp index 438ff58..8ad58d4 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 . -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests 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 06a68d9..f659d58 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 . -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests # 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 081a919..16541b2 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. # -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests # This test requires the compiler to generate a tail call. To guarantee that # we always get one, we use an assembly source file. diff --git a/gdb/testsuite/gdb.btrace/tailcall.exp b/gdb/testsuite/gdb.btrace/tailcall.exp index 028e03f..f422fbb 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 . -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests # This test requires the compiler to generate a tail call. To guarantee that # 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 1bfa4dc..291d7df 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 . -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests standard_testfile diff --git a/gdb/testsuite/gdb.btrace/vdso.exp b/gdb/testsuite/gdb.btrace/vdso.exp index ef2ef2c..16a7e23 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. -if { [skip_btrace_tests] } { - unsupported "target does not support record-btrace" - return -1 -} +require !skip_btrace_tests 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/testsuite/gdb.python/py-record-btrace-threads.exp index 53f4a7b..ef14edce 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 @@ # Skip this test if btrace is disabled. -if { [skip_btrace_tests] } { - untested "skipping btrace tests" - return -1 -} +require !skip_btrace_tests standard_testfile diff --git a/gdb/testsuite/gdb.python/py-record-btrace.exp b/gdb/testsuite/gdb.python/py-record-btrace.exp index 0d36959..38c326f 100644 --- a/gdb/testsuite/gdb.python/py-record-btrace.exp +++ b/gdb/testsuite/gdb.python/py-record-btrace.exp @@ -17,10 +17,7 @@ # Skip this test if btrace is disabled. -if { [skip_btrace_tests] } { - untested "skipping btrace tests" - return -1 -} +require !skip_btrace_tests load_lib gdb-python.exp -- cgit v1.1