summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2009-08-18 21:40:24 -0400
committerDJ Delorie <dj@gcc.gnu.org>2009-08-18 21:40:24 -0400
commit40986754d7550f7e1e69289a30db4fccaa99aeb1 (patch)
tree8e144ea8a7be24c48d09d732f73d3c181fab5912
parent75f1f2250196bdee3cd7f33cd3c415a1503890d7 (diff)
downloadgcc-40986754d7550f7e1e69289a30db4fccaa99aeb1.tar.gz
wrapper.exp: Move load of target-libpath.exp from here...
* lib/wrapper.exp: Move load of target-libpath.exp from here... * lib/gcc-defs.exp: ... to here. From-SVN: r150929
-rw-r--r--gcc/testsuite/ChangeLog3
-rw-r--r--gcc/testsuite/lib/gcc-defs.exp2
-rw-r--r--gcc/testsuite/lib/wrapper.exp2
3 files changed, 5 insertions, 2 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 385c982c88d..ea60d928e8b 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
2009-08-18 DJ Delorie <dj@redhat.com>
+ * lib/wrapper.exp: Move load of target-libpath.exp from here...
+ * lib/gcc-defs.exp: ... to here.
+
* lib/wrapper.exp (${tool}_maybe_build_wrapper): Set up
GCC_EXEC_PREFIX before building the wrapper.
diff --git a/gcc/testsuite/lib/gcc-defs.exp b/gcc/testsuite/lib/gcc-defs.exp
index 53926a69a23..776456d6092 100644
--- a/gcc/testsuite/lib/gcc-defs.exp
+++ b/gcc/testsuite/lib/gcc-defs.exp
@@ -14,6 +14,8 @@
# along with GCC; see the file COPYING3. If not see
# <http://www.gnu.org/licenses/>.
+load_lib target-libpath.exp
+
load_lib wrapper.exp
#
diff --git a/gcc/testsuite/lib/wrapper.exp b/gcc/testsuite/lib/wrapper.exp
index fba7324ece4..b7f7773aac5 100644
--- a/gcc/testsuite/lib/wrapper.exp
+++ b/gcc/testsuite/lib/wrapper.exp
@@ -16,8 +16,6 @@
# This file contains GCC-specifics for status wrappers for test programs.
-load_lib target-libpath.exp
-
# ${tool}_maybe_build_wrapper -- Build wrapper object if the target
# needs it. FILENAME is the path to the wrapper file. If there are
# additional arguments, they are command-line options to provide to