From: Ulrich Weigand <uweigand@de.ibm.com>
Date: Thu, 24 Jul 2014 17:29:11 +0000 (+0000)
Subject: backport: struct-layout-1.exp: Load g++-dg.exp.
X-Git-Tag: releases/gcc-4.8.4~342
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2aeba4c506caf7526665a15e2cca3747d28699b0;p=thirdparty%2Fgcc.git

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 de16e2b6ee3a..394ca7ae4475 100644
--- 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 04232160fe2f..608b70e7625d 100644
--- 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