diff options
author | Tom Tromey <tom@tromey.com> | 2022-12-14 10:11:33 -0700 |
---|---|---|
committer | Tom Tromey <tom@tromey.com> | 2023-01-13 13:18:56 -0700 |
commit | 78a1c061b2ad49c687ca1ecc4e87acadfad37e1f (patch) | |
tree | d05c49fb81f2a2ff0adb818a93f80f211868be27 | |
parent | ba16d4d85f053d8a533b0c40218f4d681f6eebd5 (diff) | |
download | gdb-78a1c061b2ad49c687ca1ecc4e87acadfad37e1f.zip gdb-78a1c061b2ad49c687ca1ecc4e87acadfad37e1f.tar.gz gdb-78a1c061b2ad49c687ca1ecc4e87acadfad37e1f.tar.bz2 |
Use require !skip_shlib_tests
This changes some tests to use "require !skip_shlib_tests". This patch
cleans up a few spots that were missed in the earlier patch.
-rw-r--r-- | gdb/testsuite/gdb.base/attach-pie-misread.exp | 4 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/break-interp.exp | 4 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/info-fun.exp | 3 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/prelink.exp | 4 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/skip-solib.exp | 4 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/solib-search.exp | 3 |
6 files changed, 12 insertions, 10 deletions
diff --git a/gdb/testsuite/gdb.base/attach-pie-misread.exp b/gdb/testsuite/gdb.base/attach-pie-misread.exp index 4e0d549..9adf107 100644 --- a/gdb/testsuite/gdb.base/attach-pie-misread.exp +++ b/gdb/testsuite/gdb.base/attach-pie-misread.exp @@ -14,8 +14,8 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # This test only works on GNU/Linux. -require !use_gdb_stub isnative -if { [is_remote host] || ![istarget *-linux*] || [skip_shlib_tests]} { +require !use_gdb_stub isnative !skip_shlib_tests +if { [is_remote host] || ![istarget *-linux*] } { return } diff --git a/gdb/testsuite/gdb.base/break-interp.exp b/gdb/testsuite/gdb.base/break-interp.exp index 2cee092..21452d8 100644 --- a/gdb/testsuite/gdb.base/break-interp.exp +++ b/gdb/testsuite/gdb.base/break-interp.exp @@ -14,8 +14,8 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # This test only works on GNU/Linux. -require !use_gdb_stub isnative -if { [is_remote host] || ![istarget *-linux*] || [skip_shlib_tests]} { +require !use_gdb_stub isnative !skip_shlib_tests +if { [is_remote host] || ![istarget *-linux*] } { return } diff --git a/gdb/testsuite/gdb.base/info-fun.exp b/gdb/testsuite/gdb.base/info-fun.exp index 5bae3e2..0752004 100644 --- a/gdb/testsuite/gdb.base/info-fun.exp +++ b/gdb/testsuite/gdb.base/info-fun.exp @@ -12,7 +12,8 @@ # 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 { [skip_shlib_tests] || [is_remote target] } { +require !skip_shlib_tests +if { [is_remote target] } { return 0 } diff --git a/gdb/testsuite/gdb.base/prelink.exp b/gdb/testsuite/gdb.base/prelink.exp index 9c5b777b..1e40aec 100644 --- a/gdb/testsuite/gdb.base/prelink.exp +++ b/gdb/testsuite/gdb.base/prelink.exp @@ -19,8 +19,8 @@ # This file was written by Alexandre Oliva <aoliva@redhat.com> -require isnative -if { [is_remote host] || [skip_shlib_tests]} { +require isnative !skip_shlib_tests +if { [is_remote host] } { return } diff --git a/gdb/testsuite/gdb.base/skip-solib.exp b/gdb/testsuite/gdb.base/skip-solib.exp index 22a1e87..f5850c7 100644 --- a/gdb/testsuite/gdb.base/skip-solib.exp +++ b/gdb/testsuite/gdb.base/skip-solib.exp @@ -20,8 +20,8 @@ # # This only works on GNU/Linux. -require isnative -if { [is_remote host] || ![istarget *-linux*] || [skip_shlib_tests]} { +require isnative !skip_shlib_tests +if { [is_remote host] || ![istarget *-linux*] } { return } diff --git a/gdb/testsuite/gdb.base/solib-search.exp b/gdb/testsuite/gdb.base/solib-search.exp index 8d2dacf..c77fcc4 100644 --- a/gdb/testsuite/gdb.base/solib-search.exp +++ b/gdb/testsuite/gdb.base/solib-search.exp @@ -16,7 +16,8 @@ # Test solib-search-path, and in the case of solib-svr4.c whether l_addr_p # is properly reset when the path is changed. -if {[is_remote target] || [skip_shlib_tests]} { +require !skip_shlib_tests +if {[is_remote target]} { untested "skipping remote target and shared library tests" return -1 } |