diff mbox series

[36/46] Use require skip_shlib_tests

Message ID	20221217000818.3729389-37-tom@tromey.com
State	Committed
Headers	DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8F4E63835E32 From: Tom Tromey <tom@tromey.com> To: gdb-patches@sourceware.org Cc: Tom Tromey <tom@tromey.com> Subject: [PATCH 36/46] Use require skip_shlib_tests Date: Fri, 16 Dec 2022 17:08:08 -0700 Message-Id: <20221217000818.3729389-37-tom@tromey.com> In-Reply-To: <20221217000818.3729389-1-tom@tromey.com> References: <20221217000818.3729389-1-tom@tromey.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" <gdb-patches-bounces+patchwork=sourceware.org@sourceware.org>
Series	Rewrite "require" test procedure and use it more often \| [00/46] Rewrite "require" test procedure and use it more often [01/46] Don't use ensure_gdb_index with require [02/46] Change 'require' to accept a list of predicates [03/46] Use unsupported in 'require' [04/46] Use require supports_reverse [05/46] Use require supports_process_record [06/46] Use require dwarf2_support [07/46] Use require is_x86_like_target [08/46] Use require skip_cplus_tests [09/46] Use require skip_shlib_tests [10/46] Use require skip_dlmopen_tests [11/46] Use require skip_stl_tests [12/46] Use require skip_rust_tests [13/46] Use require skip_fortran_tests [14/46] Use require skip_ada_tests [15/46] Use require skip_go_tests [16/46] Use require skip_d_tests [17/46] Use require skip_ctf_tests [18/46] Use require skip_hw_watchpoint_tests [19/46] Use require skip_ifunc_tests [20/46] Use require skip_aarch64_sve_tests [21/46] Use require skip_btrace_tests [22/46] Use require skip_btrace_tests [23/46] Use require skip_avx_* [24/46] Use require support_displaced_stepping [25/46] Use require is_aarch64_target [26/46] Use require is_aarch32_target [27/46] Use require is_amd64_regs_target [28/46] Use require is_elf_target [29/46] Use require can_single_step_to_signal_handler [30/46] Use require supports_get_siginfo_type [31/46] Use require support_go_compile [32/46] Use require use_gdb_stub [33/46] Use require can_spawn_for_attach [34/46] Use require isnative [35/46] Use require skip_gdbserver_tests [36/46] Use require skip_shlib_tests [37/46] Use require is_c_compiler_gcc [38/46] Use require gdb_debug_enabled [39/46] Use require gdb_skip_xml_test [40/46] Use require gdb_trace_common_supports_arch [41/46] Use require skip_perf_tests [42/46] Use require skip_opencl_tests [43/46] Use require target_can_use_run_cmd [44/46] Use require using_fission [45/46] Use require skip_debuginfod_tests [46/46] Use require gnat_runtime_has_debug_info

Commit Message

Tom Tromey Dec. 17, 2022, 12:08 a.m. UTC

  This changes some tests to use "require skip_shlib_tests".  This patch
cleans up a few spots that were missed in the earlier patch.
---
 gdb/testsuite/gdb.base/attach-pie-misread.exp | 4 ++--
 gdb/testsuite/gdb.base/break-interp.exp       | 4 ++--
 gdb/testsuite/gdb.base/info-fun.exp           | 3 ++-
 gdb/testsuite/gdb.base/prelink.exp            | 4 ++--
 gdb/testsuite/gdb.base/skip-solib.exp         | 4 ++--
 gdb/testsuite/gdb.base/solib-search.exp       | 3 ++-
 6 files changed, 12 insertions(+), 10 deletions(-)

diff mbox series

Patch

diff --git a/gdb/testsuite/gdb.base/attach-pie-misread.exp b/gdb/testsuite/gdb.base/attach-pie-misread.exp
index d1614b38242..d1b2d781dae 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 f0923239195..39e49f9be7e 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 f2ebd6f19b7..32e1ea52943 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 755f687607b..2b2b10c1c0d 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 e1245e7b4b8..a056018ce04 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 ab4f2c45072..abfcfbfc803 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
 }