From 980d95b48c01c33295e893c7d9385ffa637d195b Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 13 Dec 2022 15:40:02 -0700 Subject: [PATCH] Use require !skip_shlib_tests This changes some tests to use "require !skip_shlib_tests". --- gdb/testsuite/gdb.ada/catch_ex_std.exp | 4 +--- gdb/testsuite/gdb.base/bfd-errors.exp | 4 +--- gdb/testsuite/gdb.base/break-probes.exp | 4 +--- gdb/testsuite/gdb.base/catch-load.exp | 5 +---- gdb/testsuite/gdb.base/ctxobj.exp | 4 +--- gdb/testsuite/gdb.base/dprintf-pending.exp | 4 +--- gdb/testsuite/gdb.base/dso2dso.exp | 4 +--- gdb/testsuite/gdb.base/fixsection.exp | 4 +--- .../gdb.base/fork-no-detach-follow-child-dlopen.exp | 4 +--- gdb/testsuite/gdb.base/gcore-relro.exp | 4 +--- gdb/testsuite/gdb.base/gdb1555.exp | 4 +--- gdb/testsuite/gdb.base/global-var-nested-by-dso.exp | 4 +--- gdb/testsuite/gdb.base/gnu-ifunc.exp | 4 +--- gdb/testsuite/gdb.base/hbreak-in-shr-unsupported.exp | 4 +--- gdb/testsuite/gdb.base/info-shared.exp | 4 +--- gdb/testsuite/gdb.base/info_sources_2.exp | 4 +--- gdb/testsuite/gdb.base/jit-bfd-name.exp | 5 +---- gdb/testsuite/gdb.base/jit-elf-fork.exp | 5 +---- gdb/testsuite/gdb.base/jit-elf-so.exp | 5 +---- gdb/testsuite/gdb.base/jit-elf.exp | 5 +---- gdb/testsuite/gdb.base/jit-reader-simple.exp | 5 +---- gdb/testsuite/gdb.base/jit-reader.exp | 4 +--- gdb/testsuite/gdb.base/msym-bp-shl.exp | 4 +--- gdb/testsuite/gdb.base/pending.exp | 4 +--- gdb/testsuite/gdb.base/print-file-var.exp | 4 +--- gdb/testsuite/gdb.base/print-symbol-loading.exp | 4 +--- gdb/testsuite/gdb.base/shlib-call.exp | 4 +--- gdb/testsuite/gdb.base/shreloc.exp | 4 +--- gdb/testsuite/gdb.base/signed-builtin-types.exp | 4 +--- gdb/testsuite/gdb.base/so-impl-ld.exp | 4 +--- gdb/testsuite/gdb.base/solib-corrupted.exp | 4 +--- gdb/testsuite/gdb.base/solib-disc.exp | 4 +--- gdb/testsuite/gdb.base/solib-display.exp | 4 +--- gdb/testsuite/gdb.base/solib-nodir.exp | 4 +--- gdb/testsuite/gdb.base/solib-overlap.exp | 4 +--- gdb/testsuite/gdb.base/solib-symbol.exp | 4 +--- gdb/testsuite/gdb.base/solib-vanish.exp | 4 +--- gdb/testsuite/gdb.base/solib-weak.exp | 4 +--- gdb/testsuite/gdb.base/sym-file.exp | 4 +--- gdb/testsuite/gdb.base/symtab-search-order.exp | 4 +--- gdb/testsuite/gdb.base/type-opaque.exp | 4 +--- gdb/testsuite/gdb.base/unload.exp | 4 +--- gdb/testsuite/gdb.base/watchpoint-solib.exp | 4 +--- gdb/testsuite/gdb.btrace/dlopen.exp | 10 +--------- gdb/testsuite/gdb.compile/compile.exp | 5 +---- gdb/testsuite/gdb.cp/except-multi-location.exp | 4 +--- gdb/testsuite/gdb.cp/infcall-dlopen.exp | 4 +--- gdb/testsuite/gdb.dwarf2/dw2-zero-range.exp | 6 +----- .../gdb.dwarf2/locexpr-data-member-location.exp | 4 +--- gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp | 4 +--- gdb/testsuite/gdb.mi/mi-catch-load.exp | 4 +--- gdb/testsuite/gdb.mi/mi-dprintf-pending.exp | 4 +--- gdb/testsuite/gdb.mi/mi-pending.exp | 4 +--- gdb/testsuite/gdb.mi/mi-solib.exp | 5 +---- gdb/testsuite/gdb.mi/mi-var-invalidate-shlib.exp | 4 +--- gdb/testsuite/gdb.opt/solib-intra-step.exp | 4 +--- gdb/testsuite/gdb.python/py-event-load.exp | 5 +---- gdb/testsuite/gdb.python/py-finish-breakpoint.exp | 5 +---- gdb/testsuite/gdb.python/py-shared.exp | 4 +--- gdb/testsuite/gdb.server/server-exec-info.exp | 4 +--- gdb/testsuite/gdb.server/solib-list.exp | 4 +--- gdb/testsuite/gdb.threads/dlopen-libpthread.exp | 3 ++- gdb/testsuite/gdb.trace/change-loc.exp | 4 +--- gdb/testsuite/gdb.trace/ftrace-lock.exp | 4 +--- gdb/testsuite/gdb.trace/ftrace.exp | 4 +--- gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp | 4 +--- gdb/testsuite/gdb.trace/pending.exp | 4 +--- gdb/testsuite/gdb.trace/range-stepping.exp | 4 +--- gdb/testsuite/gdb.trace/strace.exp | 4 +--- gdb/testsuite/gdb.trace/trace-break.exp | 4 +--- gdb/testsuite/gdb.trace/trace-condition.exp | 4 +--- gdb/testsuite/gdb.trace/trace-enable-disable.exp | 4 +--- gdb/testsuite/gdb.trace/trace-mt.exp | 4 +--- gdb/testsuite/gdb.trace/tspeed.exp | 4 +--- 74 files changed, 75 insertions(+), 238 deletions(-) diff --git a/gdb/testsuite/gdb.ada/catch_ex_std.exp b/gdb/testsuite/gdb.ada/catch_ex_std.exp index ba8d0d9b590..30d19e1f27b 100644 --- a/gdb/testsuite/gdb.ada/catch_ex_std.exp +++ b/gdb/testsuite/gdb.ada/catch_ex_std.exp @@ -13,9 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -if {[skip_shlib_tests]} { - return 0 -} +require !skip_shlib_tests load_lib "ada.exp" diff --git a/gdb/testsuite/gdb.base/bfd-errors.exp b/gdb/testsuite/gdb.base/bfd-errors.exp index 6d1a4c64b21..f55fd296d4b 100644 --- a/gdb/testsuite/gdb.base/bfd-errors.exp +++ b/gdb/testsuite/gdb.base/bfd-errors.exp @@ -46,9 +46,7 @@ # This test can't be run on targets lacking shared library support # or for non-ELF targets. -if { [skip_shlib_tests] || ![is_elf_target] } { - return 0 -} +require !skip_shlib_tests is_elf_target # Library file names and flags: set lib_basename ${::gdb_test_file_name}-lib diff --git a/gdb/testsuite/gdb.base/break-probes.exp b/gdb/testsuite/gdb.base/break-probes.exp index ca33fba97b2..d0a3786e2c2 100644 --- a/gdb/testsuite/gdb.base/break-probes.exp +++ b/gdb/testsuite/gdb.base/break-probes.exp @@ -13,9 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -if { [skip_shlib_tests] } { - return 0 -} +require !skip_shlib_tests standard_testfile diff --git a/gdb/testsuite/gdb.base/catch-load.exp b/gdb/testsuite/gdb.base/catch-load.exp index 3cbea0fa43f..f53e162a35e 100644 --- a/gdb/testsuite/gdb.base/catch-load.exp +++ b/gdb/testsuite/gdb.base/catch-load.exp @@ -13,10 +13,7 @@ # along with this program. If not, see . # -if {[skip_shlib_tests]} { - untested "skipping shared library tests" - return -1 -} +require !skip_shlib_tests standard_testfile .c if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug shlib_load}] != "" } { diff --git a/gdb/testsuite/gdb.base/ctxobj.exp b/gdb/testsuite/gdb.base/ctxobj.exp index cd66c6c1ade..4d54ed90de4 100644 --- a/gdb/testsuite/gdb.base/ctxobj.exp +++ b/gdb/testsuite/gdb.base/ctxobj.exp @@ -13,9 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . */ -if {[skip_shlib_tests]} { - return -1 -} +require !skip_shlib_tests set executable ctxobj-m diff --git a/gdb/testsuite/gdb.base/dprintf-pending.exp b/gdb/testsuite/gdb.base/dprintf-pending.exp index 810433c18c4..bb30ce5528d 100644 --- a/gdb/testsuite/gdb.base/dprintf-pending.exp +++ b/gdb/testsuite/gdb.base/dprintf-pending.exp @@ -14,9 +14,7 @@ # along with this program. If not, see . -if {[skip_shlib_tests]} { - return 0 -} +require !skip_shlib_tests standard_testfile set libfile "dprintf-pendshr" diff --git a/gdb/testsuite/gdb.base/dso2dso.exp b/gdb/testsuite/gdb.base/dso2dso.exp index 52afbdb297e..5615254588a 100644 --- a/gdb/testsuite/gdb.base/dso2dso.exp +++ b/gdb/testsuite/gdb.base/dso2dso.exp @@ -23,9 +23,7 @@ # also happens to exercise an issue with displaced stepping on amd64 # when libdso1 is mapped at an address greater than 0xffffffff. -if { [skip_shlib_tests] } { - return 0 -} +require !skip_shlib_tests standard_testfile diff --git a/gdb/testsuite/gdb.base/fixsection.exp b/gdb/testsuite/gdb.base/fixsection.exp index 5c42e9af8b7..ec2d7931161 100644 --- a/gdb/testsuite/gdb.base/fixsection.exp +++ b/gdb/testsuite/gdb.base/fixsection.exp @@ -14,9 +14,7 @@ # along with this program. If not, see . -if {[skip_shlib_tests]} { - return 0 -} +require !skip_shlib_tests standard_testfile .c diff --git a/gdb/testsuite/gdb.base/fork-no-detach-follow-child-dlopen.exp b/gdb/testsuite/gdb.base/fork-no-detach-follow-child-dlopen.exp index 4bad7e55904..5e907c2a43d 100644 --- a/gdb/testsuite/gdb.base/fork-no-detach-follow-child-dlopen.exp +++ b/gdb/testsuite/gdb.base/fork-no-detach-follow-child-dlopen.exp @@ -23,9 +23,7 @@ # in the source of the shlib, and "list" should display the source where # the program stopped. -if { [skip_shlib_tests] } { - return 0 -} +require !skip_shlib_tests standard_testfile .c -shlib.c set shlib_path [standard_output_file ${testfile}-lib.so] diff --git a/gdb/testsuite/gdb.base/gcore-relro.exp b/gdb/testsuite/gdb.base/gcore-relro.exp index 49a4be4de32..efae85a2eb0 100644 --- a/gdb/testsuite/gdb.base/gcore-relro.exp +++ b/gdb/testsuite/gdb.base/gcore-relro.exp @@ -13,9 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -if {[skip_shlib_tests]} { - return 0 -} +require !skip_shlib_tests standard_testfile gcore-relro-main.c set libfile gcore-relro-lib diff --git a/gdb/testsuite/gdb.base/gdb1555.exp b/gdb/testsuite/gdb.base/gdb1555.exp index 246108e0652..6cf1c71d1b0 100644 --- a/gdb/testsuite/gdb.base/gdb1555.exp +++ b/gdb/testsuite/gdb.base/gdb1555.exp @@ -17,9 +17,7 @@ # a shared library (PR gdb/1555, was PR shlib/1280, shlib/1237). # Tested on ppc-yellowdog-linux (Yellow Dog Linux 3.0 3.2.2-2a) -if {[skip_shlib_tests]} { - return 0 -} +require !skip_shlib_tests standard_testfile gdb1555-main.c gdb1555.c diff --git a/gdb/testsuite/gdb.base/global-var-nested-by-dso.exp b/gdb/testsuite/gdb.base/global-var-nested-by-dso.exp index a4507a8066d..37e3c9e1112 100644 --- a/gdb/testsuite/gdb.base/global-var-nested-by-dso.exp +++ b/gdb/testsuite/gdb.base/global-var-nested-by-dso.exp @@ -13,9 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -if { [skip_shlib_tests] } { - return 0 -} +require !skip_shlib_tests standard_testfile diff --git a/gdb/testsuite/gdb.base/gnu-ifunc.exp b/gdb/testsuite/gdb.base/gnu-ifunc.exp index 783b123e87a..fd5eaa1233b 100644 --- a/gdb/testsuite/gdb.base/gnu-ifunc.exp +++ b/gdb/testsuite/gdb.base/gnu-ifunc.exp @@ -13,9 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -if {[skip_shlib_tests]} { - return 0 -} +require !skip_shlib_tests if {[skip_ifunc_tests]} { return 0 diff --git a/gdb/testsuite/gdb.base/hbreak-in-shr-unsupported.exp b/gdb/testsuite/gdb.base/hbreak-in-shr-unsupported.exp index 5c20e9f2dc5..f5e608eb1c3 100644 --- a/gdb/testsuite/gdb.base/hbreak-in-shr-unsupported.exp +++ b/gdb/testsuite/gdb.base/hbreak-in-shr-unsupported.exp @@ -17,9 +17,7 @@ # when the target doesn't support hw breakpoints doesn't silently # error out without informing the user. -if {[skip_shlib_tests]} { - return -1 -} +require !skip_shlib_tests set main_src hbreak-in-shr-unsupported.c set lib_src hbreak-in-shr-unsupported-shr.c diff --git a/gdb/testsuite/gdb.base/info-shared.exp b/gdb/testsuite/gdb.base/info-shared.exp index 1f8bb76a722..29f77ceb479 100644 --- a/gdb/testsuite/gdb.base/info-shared.exp +++ b/gdb/testsuite/gdb.base/info-shared.exp @@ -13,9 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -if { [skip_shlib_tests] } { - return 0 -} +require !skip_shlib_tests standard_testfile diff --git a/gdb/testsuite/gdb.base/info_sources_2.exp b/gdb/testsuite/gdb.base/info_sources_2.exp index 6c3b685e00e..58dfbe4c2eb 100644 --- a/gdb/testsuite/gdb.base/info_sources_2.exp +++ b/gdb/testsuite/gdb.base/info_sources_2.exp @@ -16,9 +16,7 @@ # Test 'info sources' when the test file makes use of a shared # library. -if { [skip_shlib_tests] } { - return 0 -} +require !skip_shlib_tests set is_remote_target [is_remote target] diff --git a/gdb/testsuite/gdb.base/jit-bfd-name.exp b/gdb/testsuite/gdb.base/jit-bfd-name.exp index 640840f6ddc..cd7056df252 100644 --- a/gdb/testsuite/gdb.base/jit-bfd-name.exp +++ b/gdb/testsuite/gdb.base/jit-bfd-name.exp @@ -20,10 +20,7 @@ # Additionally, check that GDB cau use 'dump binary memory' to write # out the in-memory JIT files. -if {[skip_shlib_tests]} { - untested "skipping shared library tests" - return -1 -} +require !skip_shlib_tests load_lib jit-elf-helpers.exp diff --git a/gdb/testsuite/gdb.base/jit-elf-fork.exp b/gdb/testsuite/gdb.base/jit-elf-fork.exp index 8c3347f659d..51f68cd75cd 100644 --- a/gdb/testsuite/gdb.base/jit-elf-fork.exp +++ b/gdb/testsuite/gdb.base/jit-elf-fork.exp @@ -15,10 +15,7 @@ # Test fork handling of an inferior that has JIT-ed objfiles. -if {[skip_shlib_tests]} { - untested "skipping shared library tests" - return -1 -} +require !skip_shlib_tests load_lib jit-elf-helpers.exp diff --git a/gdb/testsuite/gdb.base/jit-elf-so.exp b/gdb/testsuite/gdb.base/jit-elf-so.exp index f76228290a7..148a0fc3b6f 100644 --- a/gdb/testsuite/gdb.base/jit-elf-so.exp +++ b/gdb/testsuite/gdb.base/jit-elf-so.exp @@ -16,10 +16,7 @@ # The same tests as in jit.exp, but loading JITer itself from a shared # library. -if {[skip_shlib_tests]} { - untested "skipping shared library tests" - return -1 -} +require !skip_shlib_tests load_lib jit-elf-helpers.exp diff --git a/gdb/testsuite/gdb.base/jit-elf.exp b/gdb/testsuite/gdb.base/jit-elf.exp index aef1a963a30..42c5339eb76 100644 --- a/gdb/testsuite/gdb.base/jit-elf.exp +++ b/gdb/testsuite/gdb.base/jit-elf.exp @@ -13,10 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -if {[skip_shlib_tests]} { - untested "skipping shared library tests" - return -1 -} +require !skip_shlib_tests load_lib jit-elf-helpers.exp diff --git a/gdb/testsuite/gdb.base/jit-reader-simple.exp b/gdb/testsuite/gdb.base/jit-reader-simple.exp index 999e8f0b943..e46628d6ae2 100644 --- a/gdb/testsuite/gdb.base/jit-reader-simple.exp +++ b/gdb/testsuite/gdb.base/jit-reader-simple.exp @@ -24,10 +24,7 @@ # For completeness, also test when the JIT descriptor does not change # address between runs. -if {[skip_shlib_tests]} { - untested "skipping shared library tests" - return -1 -} +require !skip_shlib_tests standard_testfile diff --git a/gdb/testsuite/gdb.base/jit-reader.exp b/gdb/testsuite/gdb.base/jit-reader.exp index 5f8b6b0343c..1d02233406e 100644 --- a/gdb/testsuite/gdb.base/jit-reader.exp +++ b/gdb/testsuite/gdb.base/jit-reader.exp @@ -22,9 +22,7 @@ if { (![istarget x86_64-*-*] && ![istarget i?86-*-*]) || ![is_lp64_target] } { return -1; } -if {[skip_shlib_tests]} { - return -1 -} +require !skip_shlib_tests if { ![isnative] } { return -1 diff --git a/gdb/testsuite/gdb.base/msym-bp-shl.exp b/gdb/testsuite/gdb.base/msym-bp-shl.exp index 45ff5c8ff83..05587580962 100644 --- a/gdb/testsuite/gdb.base/msym-bp-shl.exp +++ b/gdb/testsuite/gdb.base/msym-bp-shl.exp @@ -18,9 +18,7 @@ # static function named "foo" exists in the shared library. Tests # both with and without debug info. -if {[skip_shlib_tests]} { - return 0 -} +require !skip_shlib_tests standard_testfile msym-bp-shl-main.c msym-bp-shl-main-2.c msym-bp-shl-lib.c set srcfile ${srcdir}/${subdir}/${srcfile} diff --git a/gdb/testsuite/gdb.base/pending.exp b/gdb/testsuite/gdb.base/pending.exp index bcd822a0a69..c1fbe77d8ee 100644 --- a/gdb/testsuite/gdb.base/pending.exp +++ b/gdb/testsuite/gdb.base/pending.exp @@ -19,9 +19,7 @@ # test running programs # -if {[skip_shlib_tests]} { - return 0 -} +require !skip_shlib_tests standard_testfile .c set libfile "pendshr" diff --git a/gdb/testsuite/gdb.base/print-file-var.exp b/gdb/testsuite/gdb.base/print-file-var.exp index a0fb4b8a6ea..00105a8f5cd 100644 --- a/gdb/testsuite/gdb.base/print-file-var.exp +++ b/gdb/testsuite/gdb.base/print-file-var.exp @@ -13,9 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . */ -if {[skip_shlib_tests]} { - return -1 -} +require !skip_shlib_tests proc test {hidden dlopen version_id_main lang} { global srcdir subdir diff --git a/gdb/testsuite/gdb.base/print-symbol-loading.exp b/gdb/testsuite/gdb.base/print-symbol-loading.exp index a23af854f8d..e91fea9e5d8 100644 --- a/gdb/testsuite/gdb.base/print-symbol-loading.exp +++ b/gdb/testsuite/gdb.base/print-symbol-loading.exp @@ -15,9 +15,7 @@ # Test the "print symbol-loading" option. -if {[skip_shlib_tests]} { - return 0 -} +require !skip_shlib_tests standard_testfile print-symbol-loading-main.c set libfile print-symbol-loading-lib diff --git a/gdb/testsuite/gdb.base/shlib-call.exp b/gdb/testsuite/gdb.base/shlib-call.exp index 735b8fd5ba6..4dadb256b31 100644 --- a/gdb/testsuite/gdb.base/shlib-call.exp +++ b/gdb/testsuite/gdb.base/shlib-call.exp @@ -29,9 +29,7 @@ #prop lib shr2.sl -if {[skip_shlib_tests]} { - return 0 -} +require !skip_shlib_tests if { [is_remote host] } { gdb_remote_download host $srcdir/$subdir/ss.h diff --git a/gdb/testsuite/gdb.base/shreloc.exp b/gdb/testsuite/gdb.base/shreloc.exp index f2ef03a38e4..d1d99ae42c9 100644 --- a/gdb/testsuite/gdb.base/shreloc.exp +++ b/gdb/testsuite/gdb.base/shreloc.exp @@ -19,9 +19,7 @@ # them gets relocated at load-time. Check that gdb gets the right # values for the debugging and minimal symbols. -if {[skip_shlib_tests]} { - return 0 -} +require !skip_shlib_tests # # This file uses shreloc.c, shreloc1.c and shreloc2.c diff --git a/gdb/testsuite/gdb.base/signed-builtin-types.exp b/gdb/testsuite/gdb.base/signed-builtin-types.exp index c4afc621cee..94f73f97854 100644 --- a/gdb/testsuite/gdb.base/signed-builtin-types.exp +++ b/gdb/testsuite/gdb.base/signed-builtin-types.exp @@ -13,9 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -if {[skip_shlib_tests]} { - return -1 -} +require !skip_shlib_tests standard_testfile .c -lib.c diff --git a/gdb/testsuite/gdb.base/so-impl-ld.exp b/gdb/testsuite/gdb.base/so-impl-ld.exp index b33d301f11d..f8516b741a3 100644 --- a/gdb/testsuite/gdb.base/so-impl-ld.exp +++ b/gdb/testsuite/gdb.base/so-impl-ld.exp @@ -14,9 +14,7 @@ # along with this program. If not, see . -if {[skip_shlib_tests]} { - return 0 -} +require !skip_shlib_tests standard_testfile .c set libfile "solib1" diff --git a/gdb/testsuite/gdb.base/solib-corrupted.exp b/gdb/testsuite/gdb.base/solib-corrupted.exp index 4d0ae5ac309..068a0188110 100644 --- a/gdb/testsuite/gdb.base/solib-corrupted.exp +++ b/gdb/testsuite/gdb.base/solib-corrupted.exp @@ -13,9 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -if {[skip_shlib_tests]} { - return 0 -} +require !skip_shlib_tests if {[is_remote target]} { # gdbserver prints the warning message but expect is parsing only the GDB diff --git a/gdb/testsuite/gdb.base/solib-disc.exp b/gdb/testsuite/gdb.base/solib-disc.exp index d06ee144a0b..84f6d928e79 100644 --- a/gdb/testsuite/gdb.base/solib-disc.exp +++ b/gdb/testsuite/gdb.base/solib-disc.exp @@ -15,9 +15,7 @@ # Test connecting and disconnecting at shared library events. -if {[skip_shlib_tests]} { - return 0 -} +require !skip_shlib_tests set gdbserver_reconnect_p 1 if { [info proc gdb_reconnect] == "" } { diff --git a/gdb/testsuite/gdb.base/solib-display.exp b/gdb/testsuite/gdb.base/solib-display.exp index 11bc200eb2c..d75b6f89df3 100644 --- a/gdb/testsuite/gdb.base/solib-display.exp +++ b/gdb/testsuite/gdb.base/solib-display.exp @@ -28,9 +28,7 @@ # (and thus aren't affected by shared library unloading) are not # disabled prematurely. -if { [skip_shlib_tests] } { - return 0 -} +require !skip_shlib_tests # This test is currently not supported for stub targets, because it uses the # start command (through gdb_start_cmd). In theory, it could be changed to diff --git a/gdb/testsuite/gdb.base/solib-nodir.exp b/gdb/testsuite/gdb.base/solib-nodir.exp index 125b72e9d83..62075cb3235 100644 --- a/gdb/testsuite/gdb.base/solib-nodir.exp +++ b/gdb/testsuite/gdb.base/solib-nodir.exp @@ -13,9 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . */ -if [skip_shlib_tests] { - return -} +require !skip_shlib_tests # The testcase assumes the target can access the OBJDIR. if [is_remote target] { diff --git a/gdb/testsuite/gdb.base/solib-overlap.exp b/gdb/testsuite/gdb.base/solib-overlap.exp index 0c3dd440397..084047b709f 100644 --- a/gdb/testsuite/gdb.base/solib-overlap.exp +++ b/gdb/testsuite/gdb.base/solib-overlap.exp @@ -27,9 +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. -if [skip_shlib_tests] { - return 0 -} +require !skip_shlib_tests if {![can_spawn_for_attach]} { return 0 diff --git a/gdb/testsuite/gdb.base/solib-symbol.exp b/gdb/testsuite/gdb.base/solib-symbol.exp index d10f86f8fa1..da6812884c3 100644 --- a/gdb/testsuite/gdb.base/solib-symbol.exp +++ b/gdb/testsuite/gdb.base/solib-symbol.exp @@ -15,9 +15,7 @@ # Contributed by Markus Deuling . # -if {[skip_shlib_tests]} { - return 0 -} +require !skip_shlib_tests # Library file. set libname "solib-symbol-lib" diff --git a/gdb/testsuite/gdb.base/solib-vanish.exp b/gdb/testsuite/gdb.base/solib-vanish.exp index e2280b99771..5e6b9cb2517 100644 --- a/gdb/testsuite/gdb.base/solib-vanish.exp +++ b/gdb/testsuite/gdb.base/solib-vanish.exp @@ -53,9 +53,7 @@ # 1) GDB does not segfault when stepping # 2) The stack frame is printed -if { [skip_shlib_tests] } { - return 0 -} +require !skip_shlib_tests # Library 2 set lib2name "solib-vanish-lib2" diff --git a/gdb/testsuite/gdb.base/solib-weak.exp b/gdb/testsuite/gdb.base/solib-weak.exp index f92640fcb0e..655cf087838 100644 --- a/gdb/testsuite/gdb.base/solib-weak.exp +++ b/gdb/testsuite/gdb.base/solib-weak.exp @@ -17,9 +17,7 @@ # than one shared library, when one of the implementations is a "weak" # symbol. GDB should set a breakpoint at the first copy it finds. -if {[skip_shlib_tests]} { - return 0 -} +require !skip_shlib_tests # These targets have shared libraries, but weak symbols are not meaningful. if {([istarget *-*-mingw*] diff --git a/gdb/testsuite/gdb.base/sym-file.exp b/gdb/testsuite/gdb.base/sym-file.exp index 78948f53246..666bf96d38e 100644 --- a/gdb/testsuite/gdb.base/sym-file.exp +++ b/gdb/testsuite/gdb.base/sym-file.exp @@ -33,9 +33,7 @@ if {![is_elf_target]} { return 0 } -if [skip_shlib_tests] { - return 0 -} +require !skip_shlib_tests set target_size TARGET_UNKNOWN if {[is_lp64_target]} { diff --git a/gdb/testsuite/gdb.base/symtab-search-order.exp b/gdb/testsuite/gdb.base/symtab-search-order.exp index 77888f06a6b..06b03c01dc0 100644 --- a/gdb/testsuite/gdb.base/symtab-search-order.exp +++ b/gdb/testsuite/gdb.base/symtab-search-order.exp @@ -13,9 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -if {[skip_shlib_tests]} { - return 0 -} +require !skip_shlib_tests standard_testfile .c symtab-search-order-1.c symtab-search-order-shlib-1.c set srcfile $srcdir/$subdir/$srcfile diff --git a/gdb/testsuite/gdb.base/type-opaque.exp b/gdb/testsuite/gdb.base/type-opaque.exp index 40a0df68b08..e602f341322 100644 --- a/gdb/testsuite/gdb.base/type-opaque.exp +++ b/gdb/testsuite/gdb.base/type-opaque.exp @@ -15,9 +15,7 @@ # Test resolving of an opaque type from the loaded shared library. -if {[skip_shlib_tests]} { - return -1 -} +require !skip_shlib_tests standard_testfile type-opaque-main.c diff --git a/gdb/testsuite/gdb.base/unload.exp b/gdb/testsuite/gdb.base/unload.exp index 2bd8d21e621..3f74e45b499 100644 --- a/gdb/testsuite/gdb.base/unload.exp +++ b/gdb/testsuite/gdb.base/unload.exp @@ -19,9 +19,7 @@ # test running programs # -if {[skip_shlib_tests]} { - return 0 -} +require !skip_shlib_tests set testfile "unload" set libfile "unloadshr" diff --git a/gdb/testsuite/gdb.base/watchpoint-solib.exp b/gdb/testsuite/gdb.base/watchpoint-solib.exp index 0f7c8937af6..559d77c82be 100644 --- a/gdb/testsuite/gdb.base/watchpoint-solib.exp +++ b/gdb/testsuite/gdb.base/watchpoint-solib.exp @@ -26,9 +26,7 @@ set skip_hw_watchpoint_tests_p [skip_hw_watchpoint_tests] # -if {[skip_shlib_tests]} { - return 0 -} +require !skip_shlib_tests set testfile "watchpoint-solib" set libfile "watchpoint-solib-shr" diff --git a/gdb/testsuite/gdb.btrace/dlopen.exp b/gdb/testsuite/gdb.btrace/dlopen.exp index 5d4d768dac4..b742cfa86bd 100644 --- a/gdb/testsuite/gdb.btrace/dlopen.exp +++ b/gdb/testsuite/gdb.btrace/dlopen.exp @@ -15,15 +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 -} - -if { [skip_shlib_tests] } { - unsupported "target does not support shared library tests" - return -1 -} +require !skip_btrace_tests !skip_shlib_tests standard_testfile diff --git a/gdb/testsuite/gdb.compile/compile.exp b/gdb/testsuite/gdb.compile/compile.exp index 36b504f1cab..d5f71d952a3 100644 --- a/gdb/testsuite/gdb.compile/compile.exp +++ b/gdb/testsuite/gdb.compile/compile.exp @@ -366,10 +366,7 @@ if { $srcfile3 != "" } { # Shared library tests. -if {[skip_shlib_tests]} { - untested "skipping shlib tests" - return; -} +require !skip_shlib_tests set libbin [standard_output_file ${testfile}-shlib.so] set binfile [standard_output_file ${testfile}-shlib] diff --git a/gdb/testsuite/gdb.cp/except-multi-location.exp b/gdb/testsuite/gdb.cp/except-multi-location.exp index 4c8eefa5e7a..3730d468000 100644 --- a/gdb/testsuite/gdb.cp/except-multi-location.exp +++ b/gdb/testsuite/gdb.cp/except-multi-location.exp @@ -19,9 +19,7 @@ # on the libstc++.so DSO (which is how GDB was built and revealed the # bug), and vice versa. -if {[skip_shlib_tests]} { - return 0 -} +require !skip_shlib_tests # STATIC_BIN indicates whether to build the main binary with # -static-libgcc/-static-libstdc++. STATIC_LIB is the same, but for diff --git a/gdb/testsuite/gdb.cp/infcall-dlopen.exp b/gdb/testsuite/gdb.cp/infcall-dlopen.exp index 6f662d744c3..bd66213daaf 100644 --- a/gdb/testsuite/gdb.cp/infcall-dlopen.exp +++ b/gdb/testsuite/gdb.cp/infcall-dlopen.exp @@ -13,9 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -if {[skip_shlib_tests]} { - return 0 -} +require !skip_shlib_tests standard_testfile .cc infcall-dlopen-lib.cc set libfile [standard_output_file ${testfile}.so] diff --git a/gdb/testsuite/gdb.dwarf2/dw2-zero-range.exp b/gdb/testsuite/gdb.dwarf2/dw2-zero-range.exp index 733116f18e0..06cf8daa5d6 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-zero-range.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-zero-range.exp @@ -19,11 +19,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. -require dwarf2_support - -if {[skip_shlib_tests]} { - return 0 -} +require dwarf2_support !skip_shlib_tests standard_testfile .c -shlib.c -dw.S diff --git a/gdb/testsuite/gdb.dwarf2/locexpr-data-member-location.exp b/gdb/testsuite/gdb.dwarf2/locexpr-data-member-location.exp index f58be5dd2ec..4b1334bb6c3 100644 --- a/gdb/testsuite/gdb.dwarf2/locexpr-data-member-location.exp +++ b/gdb/testsuite/gdb.dwarf2/locexpr-data-member-location.exp @@ -49,9 +49,7 @@ # which is then used by a shared object. # This test can't be run on targets lacking shared library support. -if [skip_shlib_tests] { - return 0 -} +require !skip_shlib_tests load_lib dwarf.exp diff --git a/gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp b/gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp index 5646c6f71e6..e2d9172495d 100644 --- a/gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp +++ b/gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp @@ -13,9 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -if {[skip_shlib_tests]} { - return 0 -} +require !skip_shlib_tests load_lib mi-support.exp diff --git a/gdb/testsuite/gdb.mi/mi-catch-load.exp b/gdb/testsuite/gdb.mi/mi-catch-load.exp index fa848ed8acd..f182e380770 100644 --- a/gdb/testsuite/gdb.mi/mi-catch-load.exp +++ b/gdb/testsuite/gdb.mi/mi-catch-load.exp @@ -14,9 +14,7 @@ # load_lib mi-support.exp -if {[skip_shlib_tests]} { - return -1 -} +require !skip_shlib_tests standard_testfile mi-catch-load.c diff --git a/gdb/testsuite/gdb.mi/mi-dprintf-pending.exp b/gdb/testsuite/gdb.mi/mi-dprintf-pending.exp index 9eb671ac701..54b9ca53bcd 100644 --- a/gdb/testsuite/gdb.mi/mi-dprintf-pending.exp +++ b/gdb/testsuite/gdb.mi/mi-dprintf-pending.exp @@ -19,9 +19,7 @@ load_lib mi-support.exp -if {[skip_shlib_tests]} { - return 0 -} +require !skip_shlib_tests standard_testfile mi-dprintf-pending.c diff --git a/gdb/testsuite/gdb.mi/mi-pending.exp b/gdb/testsuite/gdb.mi/mi-pending.exp index 950b17d5473..c19f3c33852 100644 --- a/gdb/testsuite/gdb.mi/mi-pending.exp +++ b/gdb/testsuite/gdb.mi/mi-pending.exp @@ -20,9 +20,7 @@ set MIFLAGS "-i=mi" # test running programs # -if {[skip_shlib_tests]} { - return 0 -} +require !skip_shlib_tests standard_testfile mi-pending.c diff --git a/gdb/testsuite/gdb.mi/mi-solib.exp b/gdb/testsuite/gdb.mi/mi-solib.exp index 39b67ef21eb..0a5650d83bf 100644 --- a/gdb/testsuite/gdb.mi/mi-solib.exp +++ b/gdb/testsuite/gdb.mi/mi-solib.exp @@ -16,10 +16,7 @@ load_lib mi-support.exp set MIFLAGS "-i=mi2" -if {[skip_shlib_tests]} { - untested "skipping shared library tests" - return -1 -} +require !skip_shlib_tests gdb_exit if [mi_gdb_start] { diff --git a/gdb/testsuite/gdb.mi/mi-var-invalidate-shlib.exp b/gdb/testsuite/gdb.mi/mi-var-invalidate-shlib.exp index bbbf898af92..9e738fb1fb5 100644 --- a/gdb/testsuite/gdb.mi/mi-var-invalidate-shlib.exp +++ b/gdb/testsuite/gdb.mi/mi-var-invalidate-shlib.exp @@ -20,9 +20,7 @@ load_lib mi-support.exp set MIFLAGS "-i=mi" -if { [skip_shlib_tests] } { - return 0 -} +require !skip_shlib_tests standard_testfile .c -lib.c set shlib_path [standard_output_file ${testfile}-lib.so] diff --git a/gdb/testsuite/gdb.opt/solib-intra-step.exp b/gdb/testsuite/gdb.opt/solib-intra-step.exp index 854ae45a520..c0e9cba0051 100644 --- a/gdb/testsuite/gdb.opt/solib-intra-step.exp +++ b/gdb/testsuite/gdb.opt/solib-intra-step.exp @@ -15,9 +15,7 @@ standard_testfile -if {[skip_shlib_tests]} { - return 0 -} +require !skip_shlib_tests # Library file. set libname "${testfile}-lib" diff --git a/gdb/testsuite/gdb.python/py-event-load.exp b/gdb/testsuite/gdb.python/py-event-load.exp index c3667b858b2..8dce6f19e5a 100644 --- a/gdb/testsuite/gdb.python/py-event-load.exp +++ b/gdb/testsuite/gdb.python/py-event-load.exp @@ -18,10 +18,7 @@ load_lib gdb-python.exp -if {[skip_shlib_tests]} { - untested "skipping shared library tests" - return -1 -} +require !skip_shlib_tests if {[get_compiler_info]} { warning "Could not get compiler info" diff --git a/gdb/testsuite/gdb.python/py-finish-breakpoint.exp b/gdb/testsuite/gdb.python/py-finish-breakpoint.exp index 31ff68ba1de..7cc2c40a299 100644 --- a/gdb/testsuite/gdb.python/py-finish-breakpoint.exp +++ b/gdb/testsuite/gdb.python/py-finish-breakpoint.exp @@ -16,10 +16,7 @@ # This file is part of the GDB testsuite. It tests the mechanism # exposing values to Python. -if {[skip_shlib_tests]} { - untested "skipping shared library tests" - return 0 -} +require !skip_shlib_tests load_lib gdb-python.exp diff --git a/gdb/testsuite/gdb.python/py-shared.exp b/gdb/testsuite/gdb.python/py-shared.exp index 2d869abb6fd..ac68e2cbd07 100644 --- a/gdb/testsuite/gdb.python/py-shared.exp +++ b/gdb/testsuite/gdb.python/py-shared.exp @@ -17,9 +17,7 @@ load_lib gdb-python.exp -if {[skip_shlib_tests]} { - return 0 -} +require !skip_shlib_tests standard_testfile diff --git a/gdb/testsuite/gdb.server/server-exec-info.exp b/gdb/testsuite/gdb.server/server-exec-info.exp index 28b295a95eb..a80c0f96480 100644 --- a/gdb/testsuite/gdb.server/server-exec-info.exp +++ b/gdb/testsuite/gdb.server/server-exec-info.exp @@ -18,9 +18,7 @@ load_lib gdbserver-support.exp # We test for skip_shlib_tests in this test because without a main # exec file we only have the exec target loaded if shared libraries # are present. -if {[skip_gdbserver_tests] || [skip_shlib_tests]} { - return -} +require !skip_gdbserver_tests !skip_shlib_tests standard_testfile server.c if [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] { diff --git a/gdb/testsuite/gdb.server/solib-list.exp b/gdb/testsuite/gdb.server/solib-list.exp index 1a117c9efaa..f22ec8956c4 100644 --- a/gdb/testsuite/gdb.server/solib-list.exp +++ b/gdb/testsuite/gdb.server/solib-list.exp @@ -23,9 +23,7 @@ load_lib gdbserver-support.exp load_lib prelink-support.exp -if {[skip_gdbserver_tests] || [skip_shlib_tests]} { - return -} +require !skip_gdbserver_tests !skip_shlib_tests standard_testfile solib-list-main.c set srclibfile ${testfile}-lib.c diff --git a/gdb/testsuite/gdb.threads/dlopen-libpthread.exp b/gdb/testsuite/gdb.threads/dlopen-libpthread.exp index c97e0284475..7ab61bfa890 100644 --- a/gdb/testsuite/gdb.threads/dlopen-libpthread.exp +++ b/gdb/testsuite/gdb.threads/dlopen-libpthread.exp @@ -13,7 +13,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -if {![isnative] || ![istarget *-linux*] || [skip_shlib_tests]} { +require isnative !skip_shlib_tests +if {![istarget *-linux*]} { return 0 } diff --git a/gdb/testsuite/gdb.trace/change-loc.exp b/gdb/testsuite/gdb.trace/change-loc.exp index fced0a4f992..75d381db3e9 100644 --- a/gdb/testsuite/gdb.trace/change-loc.exp +++ b/gdb/testsuite/gdb.trace/change-loc.exp @@ -14,9 +14,7 @@ load_lib "trace-support.exp" -if {[skip_shlib_tests]} { - return 0 -} +require !skip_shlib_tests if ![gdb_trace_common_supports_arch] { unsupported "no trace-common.h support for arch" diff --git a/gdb/testsuite/gdb.trace/ftrace-lock.exp b/gdb/testsuite/gdb.trace/ftrace-lock.exp index 47d40832eb2..e5e8638b306 100644 --- a/gdb/testsuite/gdb.trace/ftrace-lock.exp +++ b/gdb/testsuite/gdb.trace/ftrace-lock.exp @@ -14,9 +14,7 @@ load_lib "trace-support.exp" -if {[skip_shlib_tests]} { - return 0 -} +require !skip_shlib_tests standard_testfile set executable $testfile diff --git a/gdb/testsuite/gdb.trace/ftrace.exp b/gdb/testsuite/gdb.trace/ftrace.exp index 2061e793ca0..bab97cbe605 100644 --- a/gdb/testsuite/gdb.trace/ftrace.exp +++ b/gdb/testsuite/gdb.trace/ftrace.exp @@ -14,9 +14,7 @@ load_lib "trace-support.exp" -if {[skip_shlib_tests]} { - return 0 -} +require !skip_shlib_tests standard_testfile set executable $testfile diff --git a/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp b/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp index 034683d1cae..1ea8e728fb9 100644 --- a/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp +++ b/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp @@ -15,9 +15,7 @@ load_lib trace-support.exp -if {[skip_shlib_tests]} { - return 0 -} +require !skip_shlib_tests if ![gdb_trace_common_supports_arch] { unsupported "no trace-common.h support for arch" return -1 diff --git a/gdb/testsuite/gdb.trace/pending.exp b/gdb/testsuite/gdb.trace/pending.exp index e53ea6211cd..deaaeef1926 100644 --- a/gdb/testsuite/gdb.trace/pending.exp +++ b/gdb/testsuite/gdb.trace/pending.exp @@ -14,9 +14,7 @@ load_lib "trace-support.exp" -if {[skip_shlib_tests]} { - return 0 -} +require !skip_shlib_tests if ![gdb_trace_common_supports_arch] { unsupported "no trace-common.h support for arch" diff --git a/gdb/testsuite/gdb.trace/range-stepping.exp b/gdb/testsuite/gdb.trace/range-stepping.exp index 83e364558a5..cf0758e745f 100644 --- a/gdb/testsuite/gdb.trace/range-stepping.exp +++ b/gdb/testsuite/gdb.trace/range-stepping.exp @@ -65,9 +65,7 @@ proc range_stepping_with_tracepoint { type } { range_stepping_with_tracepoint "trace" -if {[skip_shlib_tests]} { - return 0 -} +require !skip_shlib_tests set libipa [get_in_proc_agent] set remote_libipa [gdb_load_shlib $libipa] diff --git a/gdb/testsuite/gdb.trace/strace.exp b/gdb/testsuite/gdb.trace/strace.exp index 1df56b8c159..f3904c21189 100644 --- a/gdb/testsuite/gdb.trace/strace.exp +++ b/gdb/testsuite/gdb.trace/strace.exp @@ -14,9 +14,7 @@ load_lib "trace-support.exp" -if {[skip_shlib_tests]} { - return 0 -} +require !skip_shlib_tests standard_testfile set executable $testfile diff --git a/gdb/testsuite/gdb.trace/trace-break.exp b/gdb/testsuite/gdb.trace/trace-break.exp index 2f63346bed7..3630aae9d69 100644 --- a/gdb/testsuite/gdb.trace/trace-break.exp +++ b/gdb/testsuite/gdb.trace/trace-break.exp @@ -345,9 +345,7 @@ foreach at_first_loc { "1" "0" } { break_trace_same_addr_6 "trace" "enable" "trace" "disable" break_trace_same_addr_6 "trace" "disable" "trace" "enable" -if {[skip_shlib_tests]} { - return 0 -} +require !skip_shlib_tests set libipa [get_in_proc_agent] set remote_libipa [gdb_load_shlib $libipa] diff --git a/gdb/testsuite/gdb.trace/trace-condition.exp b/gdb/testsuite/gdb.trace/trace-condition.exp index b683b2ae413..d6f7fc0302a 100644 --- a/gdb/testsuite/gdb.trace/trace-condition.exp +++ b/gdb/testsuite/gdb.trace/trace-condition.exp @@ -14,9 +14,7 @@ load_lib "trace-support.exp" -if {[skip_shlib_tests]} { - return 0 -} +require !skip_shlib_tests standard_testfile set executable $testfile diff --git a/gdb/testsuite/gdb.trace/trace-enable-disable.exp b/gdb/testsuite/gdb.trace/trace-enable-disable.exp index ec28d5c2c1f..e42f6f75225 100644 --- a/gdb/testsuite/gdb.trace/trace-enable-disable.exp +++ b/gdb/testsuite/gdb.trace/trace-enable-disable.exp @@ -14,9 +14,7 @@ load_lib "trace-support.exp" -if {[skip_shlib_tests]} { - return 0 -} +require !skip_shlib_tests standard_testfile set executable $testfile diff --git a/gdb/testsuite/gdb.trace/trace-mt.exp b/gdb/testsuite/gdb.trace/trace-mt.exp index 80188e8dde1..e57cad8090c 100644 --- a/gdb/testsuite/gdb.trace/trace-mt.exp +++ b/gdb/testsuite/gdb.trace/trace-mt.exp @@ -108,9 +108,7 @@ foreach break_always_inserted { "on" "off" } { step_over_tracepoint "trace" -if {[skip_shlib_tests]} { - return 0 -} +require !skip_shlib_tests set libipa [get_in_proc_agent] set remote_libipa [gdb_load_shlib $libipa] diff --git a/gdb/testsuite/gdb.trace/tspeed.exp b/gdb/testsuite/gdb.trace/tspeed.exp index 2449598d058..cbb958ae41b 100644 --- a/gdb/testsuite/gdb.trace/tspeed.exp +++ b/gdb/testsuite/gdb.trace/tspeed.exp @@ -15,9 +15,7 @@ load_lib "trace-support.exp" -if {[skip_shlib_tests]} { - return 0 -} +require !skip_shlib_tests # Do not run if gdbsever debug is enabled - the output file is many Gb. if [gdbserver_debug_enabled] { -- 2.30.2