backport: struct-layout-1.exp: Load g++-dg.exp.

gcc/testsuite/

	Backport from mainline:
	* g++.dg/compat/struct-layout-1.exp: Load g++-dg.exp.

From-SVN: r213022

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index de16e2b6ee3a61dc632ad3e2bdf648d8f712c7db..394ca7ae44757751884451b99400ab39e2990f56 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2014-07-24  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
+
+       Backport from mainline:
+       2014-07-24  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
+
+       * g++.dg/compat/struct-layout-1.exp: Load g++-dg.exp.
+
 2014-07-19  Eric Botcazou  <ebotcazou@adacore.com>
 
        * gcc.dg/stack-usage-2.c: Adjust.

diff --git a/gcc/testsuite/g++.dg/compat/struct-layout-1.exp b/gcc/testsuite/g++.dg/compat/struct-layout-1.exp
index 04232160fe2ffaed25da6045d9386eea84785627..608b70e7625dc09a8e1eb9e3efc80abcece97aab 100644 (file)
--- a/gcc/testsuite/g++.dg/compat/struct-layout-1.exp
+++ b/gcc/testsuite/g++.dg/compat/struct-layout-1.exp
@@ -89,6 +89,9 @@ proc compat-use-tst-compiler { } {
 # This must be done after the compat-use-*-compiler definitions.
 load_lib compat.exp
 
+# Provide the g++-dg-prune routine (gcc-dp.exp is loaded by compat.exp)
+load_lib g++-dg.exp
+
 g++_init
 
 # Save variables for the C++ compiler under test, which each test will