| Message ID | 20221217000818.3729389-34-tom@tromey.com |
|---|---|
| State | Committed |
| Headers | |
| Series | Rewrite "require" test procedure and use it more often | |
Commit Message
diff --git a/gdb/testsuite/gdb.base/attach-non-pgrp-leader.exp b/gdb/testsuite/gdb.base/attach-non-pgrp-leader.exp index 1b9dc8a505b..e217469ee35 100644 --- a/gdb/testsuite/gdb.base/attach-non-pgrp-leader.exp +++ b/gdb/testsuite/gdb.base/attach-non-pgrp-leader.exp @@ -18,9 +18,7 @@ # call any of setpgrp/setpgid/setsid to move itself to a new process # group. -if {![can_spawn_for_attach]} { - return 0 -} +require can_spawn_for_attach standard_testfile diff --git a/gdb/testsuite/gdb.base/attach-pie-noexec.exp b/gdb/testsuite/gdb.base/attach-pie-noexec.exp index 33238db834d..f7ea13e323f 100644 --- a/gdb/testsuite/gdb.base/attach-pie-noexec.exp +++ b/gdb/testsuite/gdb.base/attach-pie-noexec.exp @@ -13,9 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -if {![can_spawn_for_attach]} { - return 0 -} +require can_spawn_for_attach standard_testfile .c set executable ${testfile} diff --git a/gdb/testsuite/gdb.base/attach-twice.exp b/gdb/testsuite/gdb.base/attach-twice.exp index 9a00a8aa287..57bb4492f25 100644 --- a/gdb/testsuite/gdb.base/attach-twice.exp +++ b/gdb/testsuite/gdb.base/attach-twice.exp @@ -13,9 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -if {![can_spawn_for_attach]} { - return 0 -} +require can_spawn_for_attach standard_testfile set executable ${testfile} diff --git a/gdb/testsuite/gdb.base/attach.exp b/gdb/testsuite/gdb.base/attach.exp index 453fdbc7857..0f54cb69981 100644 --- a/gdb/testsuite/gdb.base/attach.exp +++ b/gdb/testsuite/gdb.base/attach.exp @@ -13,9 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. */ -if {![can_spawn_for_attach]} { - return 0 -} +require can_spawn_for_attach standard_testfile attach.c attach2.c attach3.c set binfile2 ${binfile}2 diff --git a/gdb/testsuite/gdb.base/dlmopen.exp b/gdb/testsuite/gdb.base/dlmopen.exp index e8793fbd46d..46e6fa7dc6a 100644 --- a/gdb/testsuite/gdb.base/dlmopen.exp +++ b/gdb/testsuite/gdb.base/dlmopen.exp @@ -144,10 +144,7 @@ gdb_breakpoint $srcfile:$bp_main test_dlmopen # Try the same again when attaching after dlmopen(). -if { ![can_spawn_for_attach] } { - unsupported "target does not support attach" - return -1 -} +require can_spawn_for_attach clean_restart $binfile diff --git a/gdb/testsuite/gdb.base/interrupt-daemon-attach.exp b/gdb/testsuite/gdb.base/interrupt-daemon-attach.exp index bff19074269..fd5b0528754 100644 --- a/gdb/testsuite/gdb.base/interrupt-daemon-attach.exp +++ b/gdb/testsuite/gdb.base/interrupt-daemon-attach.exp @@ -24,9 +24,7 @@ if [target_info exists gdb,nointerrupts] { return } -if { ![can_spawn_for_attach] } { - return 0 -} +require can_spawn_for_attach standard_testfile diff --git a/gdb/testsuite/gdb.base/jit-attach-pie.exp b/gdb/testsuite/gdb.base/jit-attach-pie.exp index 7a2387b34d0..469594cd9bd 100644 --- a/gdb/testsuite/gdb.base/jit-attach-pie.exp +++ b/gdb/testsuite/gdb.base/jit-attach-pie.exp @@ -13,9 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -if {![can_spawn_for_attach]} { - return 0 -} +require can_spawn_for_attach standard_testfile .c set executable ${testfile} diff --git a/gdb/testsuite/gdb.base/kill-detach-inferiors-cmd.exp b/gdb/testsuite/gdb.base/kill-detach-inferiors-cmd.exp index 868f9001802..bf2f8c870d8 100644 --- a/gdb/testsuite/gdb.base/kill-detach-inferiors-cmd.exp +++ b/gdb/testsuite/gdb.base/kill-detach-inferiors-cmd.exp @@ -18,9 +18,7 @@ # Test the basic operation of the "kill inferiors" and "detach inferiors" # commands. -if ![can_spawn_for_attach] { - return 0 -} +require can_spawn_for_attach standard_testfile set executable $testfile diff --git a/gdb/testsuite/gdb.base/run-after-attach.exp b/gdb/testsuite/gdb.base/run-after-attach.exp index beea0e594e1..31e5ec8f3ac 100644 --- a/gdb/testsuite/gdb.base/run-after-attach.exp +++ b/gdb/testsuite/gdb.base/run-after-attach.exp @@ -16,9 +16,7 @@ # Check that forking a process after a previous process was attached to unsets # attach_flag. This is done indirectly by inspecting GDB's quit prompt. -if ![can_spawn_for_attach] { - return 0 -} +require can_spawn_for_attach standard_testfile set executable $testfile diff --git a/gdb/testsuite/gdb.base/solib-overlap.exp b/gdb/testsuite/gdb.base/solib-overlap.exp index 51378826657..bb58cde3ca8 100644 --- a/gdb/testsuite/gdb.base/solib-overlap.exp +++ b/gdb/testsuite/gdb.base/solib-overlap.exp @@ -27,11 +27,7 @@ # difference appears to be caused by prelink, adjusting expectations # In such case both disk libraries will be loaded at VMAs starting at zero. -require !skip_shlib_tests - -if {![can_spawn_for_attach]} { - return 0 -} +require !skip_shlib_tests can_spawn_for_attach # Library file. set libname "solib-overlap-lib" diff --git a/gdb/testsuite/gdb.base/watchpoint-hw-attach.exp b/gdb/testsuite/gdb.base/watchpoint-hw-attach.exp index ce9263ef37a..5b810985bf3 100644 --- a/gdb/testsuite/gdb.base/watchpoint-hw-attach.exp +++ b/gdb/testsuite/gdb.base/watchpoint-hw-attach.exp @@ -18,9 +18,7 @@ require !skip_hw_watchpoint_tests -if {![can_spawn_for_attach]} { - return 0 -} +require can_spawn_for_attach standard_testfile diff --git a/gdb/testsuite/gdb.mi/list-thread-groups-available.exp b/gdb/testsuite/gdb.mi/list-thread-groups-available.exp index 4b3c6d7a18e..a66efdb06c7 100644 --- a/gdb/testsuite/gdb.mi/list-thread-groups-available.exp +++ b/gdb/testsuite/gdb.mi/list-thread-groups-available.exp @@ -35,9 +35,7 @@ if [mi_gdb_start] { return } -if ![can_spawn_for_attach] { - return -} +require can_spawn_for_attach set string_re {(?:[^\\"]|\\.)*} diff --git a/gdb/testsuite/gdb.multi/attach-no-multi-process.exp b/gdb/testsuite/gdb.multi/attach-no-multi-process.exp index 4d6cd32f17e..dd98b718368 100644 --- a/gdb/testsuite/gdb.multi/attach-no-multi-process.exp +++ b/gdb/testsuite/gdb.multi/attach-no-multi-process.exp @@ -26,9 +26,7 @@ if { [skip_gdbserver_tests] } { return 0 } -if {![can_spawn_for_attach]} { - return -} +require can_spawn_for_attach if {[build_executable "build" $testfile $srcfile {debug}] == -1} { return -1 diff --git a/gdb/testsuite/gdb.multi/multi-attach.exp b/gdb/testsuite/gdb.multi/multi-attach.exp index f4fe8773f64..e4c243fe322 100644 --- a/gdb/testsuite/gdb.multi/multi-attach.exp +++ b/gdb/testsuite/gdb.multi/multi-attach.exp @@ -19,9 +19,7 @@ standard_testfile -if {![can_spawn_for_attach]} { - return 0 -} +require can_spawn_for_attach if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug pthreads}]} { return -1 diff --git a/gdb/testsuite/gdb.multi/multi-term-settings.exp b/gdb/testsuite/gdb.multi/multi-term-settings.exp index 9e4183c7317..42876920387 100644 --- a/gdb/testsuite/gdb.multi/multi-term-settings.exp +++ b/gdb/testsuite/gdb.multi/multi-term-settings.exp @@ -25,9 +25,7 @@ standard_testfile -if ![can_spawn_for_attach] { - return 0 -} +require can_spawn_for_attach if [build_executable "failed to prepare" $testfile $srcfile {debug}] { return -1 diff --git a/gdb/testsuite/gdb.python/py-sync-interp.exp b/gdb/testsuite/gdb.python/py-sync-interp.exp index f8f5907790c..8aa64e358fb 100644 --- a/gdb/testsuite/gdb.python/py-sync-interp.exp +++ b/gdb/testsuite/gdb.python/py-sync-interp.exp @@ -20,9 +20,7 @@ standard_testfile -if {![can_spawn_for_attach]} { - return 0 -} +require can_spawn_for_attach load_lib gdb-python.exp diff --git a/gdb/testsuite/gdb.server/attach-flag.exp b/gdb/testsuite/gdb.server/attach-flag.exp index 32676a4ee70..2e3456a7fcb 100644 --- a/gdb/testsuite/gdb.server/attach-flag.exp +++ b/gdb/testsuite/gdb.server/attach-flag.exp @@ -25,9 +25,7 @@ if { [skip_gdbserver_tests] } { return 0 } -if {![can_spawn_for_attach]} { - return 0 -} +require can_spawn_for_attach # Start the test program, attach to it using gdbserver's --attach flag, connect # to it with GDB, check that what we see makes sense. diff --git a/gdb/testsuite/gdb.server/ext-attach.exp b/gdb/testsuite/gdb.server/ext-attach.exp index a67a536809c..16e4abe083f 100644 --- a/gdb/testsuite/gdb.server/ext-attach.exp +++ b/gdb/testsuite/gdb.server/ext-attach.exp @@ -26,9 +26,7 @@ if { [skip_gdbserver_tests] } { return 0 } -if {![can_spawn_for_attach]} { - return 0 -} +require can_spawn_for_attach if {[build_executable "failed to prepare" $testfile $srcfile debug]} { return -1 diff --git a/gdb/testsuite/gdb.threads/attach-many-short-lived-threads.exp b/gdb/testsuite/gdb.threads/attach-many-short-lived-threads.exp index 3417bbb8e35..348d81b95f7 100644 --- a/gdb/testsuite/gdb.threads/attach-many-short-lived-threads.exp +++ b/gdb/testsuite/gdb.threads/attach-many-short-lived-threads.exp @@ -49,9 +49,7 @@ if {[bad_dejagnu]} { return 0 } -if {![can_spawn_for_attach]} { - return 0 -} +require can_spawn_for_attach standard_testfile diff --git a/gdb/testsuite/gdb.threads/attach-non-stop.exp b/gdb/testsuite/gdb.threads/attach-non-stop.exp index 5f851ddcb85..8ca0d829af9 100644 --- a/gdb/testsuite/gdb.threads/attach-non-stop.exp +++ b/gdb/testsuite/gdb.threads/attach-non-stop.exp @@ -19,9 +19,7 @@ # - maint target non-stop off/on # - "attach" vs "attach &" -if {![can_spawn_for_attach]} { - return 0 -} +require can_spawn_for_attach standard_testfile diff --git a/gdb/testsuite/gdb.threads/clone-attach-detach.exp b/gdb/testsuite/gdb.threads/clone-attach-detach.exp index ea35c15f0a0..a9e5affbd81 100644 --- a/gdb/testsuite/gdb.threads/clone-attach-detach.exp +++ b/gdb/testsuite/gdb.threads/clone-attach-detach.exp @@ -23,9 +23,7 @@ if ![istarget *-*-linux*] { return } -if {![can_spawn_for_attach]} { - return 0 -} +require can_spawn_for_attach standard_testfile diff --git a/gdb/testsuite/gdb.threads/detach-step-over.exp b/gdb/testsuite/gdb.threads/detach-step-over.exp index 6c3a74fd16d..dbc35f2d265 100644 --- a/gdb/testsuite/gdb.threads/detach-step-over.exp +++ b/gdb/testsuite/gdb.threads/detach-step-over.exp @@ -48,9 +48,7 @@ # a breakpoint, which has helped with exposing further corner case # bugs. -if {![can_spawn_for_attach]} { - return 0 -} +require can_spawn_for_attach standard_testfile