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.

diff --git a/gdb/testsuite/gdb.base/attach-pie-misread.exp b/gdb/testsuite/gdb.base/attach-pie-misread.exp
index 4e0d549351c9397b990bd4abb3cce297dc976ac1..9adf107ad92d8bfabe562917e7be86cddae39731 100644 (file)
--- 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 2cee092b184f954ef1016f259c4568d2ef1dcc75..21452d8569e9337811cb7a3723debd28ef25a06e 100644 (file)
--- 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 5bae3e22656a412d7906ced2d34c531a257fd582..07520049244f39aa54a680d7518dad5d4fb4dcbf 100644 (file)
--- 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 9c5b777b4a2593901af57bbdd2510bfd357ff589..1e40aecc92bd68f42d415959bc04d98b0821a193 100644 (file)
--- 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 22a1e8746e73ea56f76290f06551fa2e661f1ee1..f5850c7a0b1c73b7ea7cca8ef16566d9f7922340 100644 (file)
--- 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 8d2dacfb9474bee2cdb7f7a9987f979e7ec994bb..c77fcc4f5ca98a2e4d3f5dad4187d48d03ec78a3 100644 (file)
--- 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
 }