Remove one copy of skip_compile_feature_tests

I noticed that there are two identical copies of
skip_compile_feature_tests in the test suite.  This removes one from
gdb.exp, in favor of the one in compile-support.exp.

diff --git a/gdb/testsuite/gdb.base/options.exp b/gdb/testsuite/gdb.base/options.exp
index d10e7f8d66f645e88720f0bab0968a2d7ba6cda0..8fd968de1ad149e8b009f73f43e76d4f00f10d79 100644 (file)
--- a/gdb/testsuite/gdb.base/options.exp
+++ b/gdb/testsuite/gdb.base/options.exp
@@ -31,6 +31,7 @@
 #  - thread apply
 #  - taas
 
+load_lib compile-support.exp
 load_lib completion-support.exp
 
 standard_testfile .c

diff --git a/gdb/testsuite/gdb.compile/compile-ifunc.exp b/gdb/testsuite/gdb.compile/compile-ifunc.exp
index 4f671c6453ff18763993c1feffb49f9b4ad837b3..07de52c3f671ce2f0cff1d95410f81d3ddbf15c1 100644 (file)
--- a/gdb/testsuite/gdb.compile/compile-ifunc.exp
+++ b/gdb/testsuite/gdb.compile/compile-ifunc.exp
@@ -13,6 +13,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/>.
 
+load_lib compile-support.exp
+
 if {[skip_ifunc_tests]} {
     return 0
 }

diff --git a/gdb/testsuite/gdb.compile/compile-ops.exp b/gdb/testsuite/gdb.compile/compile-ops.exp
index 76f284f52f3138d2fcf5b393d8f56e2df4b55bde..cff2f946c93ab368ceb968a68132a8ff8c8eab71 100644 (file)
--- a/gdb/testsuite/gdb.compile/compile-ops.exp
+++ b/gdb/testsuite/gdb.compile/compile-ops.exp
@@ -16,6 +16,7 @@
 # Some coverage testing of DWARF operators for the compiler
 # integration.
 
+load_lib compile-support.exp
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.

diff --git a/gdb/testsuite/gdb.compile/compile-print.exp b/gdb/testsuite/gdb.compile/compile-print.exp
index 051cfabe3ea80cb75fb286cc014a5a2620dcf507..5d01c1a53d08d3620a2a809d929884d72546a353 100644 (file)
--- a/gdb/testsuite/gdb.compile/compile-print.exp
+++ b/gdb/testsuite/gdb.compile/compile-print.exp
@@ -13,6 +13,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/>.
 
+load_lib compile-support.exp
+
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" "$testfile"] } {

diff --git a/gdb/testsuite/gdb.compile/compile-setjmp.exp b/gdb/testsuite/gdb.compile/compile-setjmp.exp
index 89a65fb0da16d48e71d3ed749bf0c294be704fda..c883b2bd5703402b2840880d889d578faf3c4103 100644 (file)
--- a/gdb/testsuite/gdb.compile/compile-setjmp.exp
+++ b/gdb/testsuite/gdb.compile/compile-setjmp.exp
@@ -13,6 +13,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/>.
 
+load_lib compile-support.exp
+
 standard_testfile .c compile-setjmp-mod.c
 
 if { [prepare_for_testing "failed to prepare" $testfile] } {

diff --git a/gdb/testsuite/gdb.compile/compile-tls.exp b/gdb/testsuite/gdb.compile/compile-tls.exp
index f9c9ee5e2f78722c58f0f4084df89d99e3a3c295..beffe7fd5bebfdcd5b62dc3f9d0dbf95f1e64228 100644 (file)
--- a/gdb/testsuite/gdb.compile/compile-tls.exp
+++ b/gdb/testsuite/gdb.compile/compile-tls.exp
@@ -13,6 +13,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/>.  */
 
+load_lib compile-support.exp
+
 standard_testfile .c
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \

diff --git a/gdb/testsuite/gdb.compile/compile.exp b/gdb/testsuite/gdb.compile/compile.exp
index f2515586c39f29e8adf1cd7b73f73fb9d533337f..c712070872aa3e85fb38fb542d090a7204ca94b8 100644 (file)
--- a/gdb/testsuite/gdb.compile/compile.exp
+++ b/gdb/testsuite/gdb.compile/compile.exp
@@ -13,6 +13,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/>.
 
+load_lib compile-support.exp
+
 standard_testfile .c compile-shlib.c compile-constvar.S compile-nodebug.c
 
 set options {}

diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index f41fc1375aa274c00f996daf835e21ab49be36f9..e4ce3c30c2ff8110b0a4a40b039687fffe19745a 100644 (file)
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -4195,26 +4195,6 @@ proc skip_libstdcxx_probe_tests {} {
     return [skip_libstdcxx_probe_tests_prompt "$gdb_prompt $"]
 }
 
-# Return 1 if we should skip tests of the "compile" feature.
-# This must be invoked after the inferior has been started.
-
-proc skip_compile_feature_tests {} {
-    global gdb_prompt
-
-    set result 0
-    gdb_test_multiple "compile code -- ;" "check for working compile command" {
-       "Could not load libcc1.*\r\n$gdb_prompt $" {
-           set result 1
-       }
-       -re "Command not supported on this host\\..*\r\n$gdb_prompt $" {
-           set result 1
-       }
-       -re "\r\n$gdb_prompt $" {
-       }
-    }
-    return $result
-}
-
 # Helper for gdb_is_target_* procs.  TARGET_NAME is the name of the target
 # we're looking for (used to build the test name).  TARGET_STACK_REGEXP
 # is a regexp that will match the output of "maint print target-stack" if