From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Thu, 14 Jan 2010 07:20:31 +0000 (+0000)
Subject: re PR testsuite/42414 (arbitrary path modification by a sed statement breaks testsuit... 
X-Git-Tag: releases/gcc-4.5.0~1243
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=453897b4dde0964a55d4b3ebbdbb2bfaabec748a;p=thirdparty%2Fgcc.git

re PR testsuite/42414 (arbitrary path modification by a sed statement breaks testsuite if testsuite is in the absolute path)

Fix PR testsuite/42414.

gcc/:
	PR testsuite/42414
	* Makefile.in ($(TESTSUITEDIR)/site.exp, check-%)
	(check-parallel-%): Match `testsuite' directory component only
	at the end.

From-SVN: r155880
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 80ab5e67c15b..49edf5b9e95a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-14  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	PR testsuite/42414
+	* Makefile.in ($(TESTSUITEDIR)/site.exp, check-%)
+	(check-parallel-%): Match `testsuite' directory component only
+	at the end.
+
 2010-01-14  Shujing Zhao  <pearly.zhao@oracle.com>
 
 	PR translation/39521
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 6e3b2c1f34bb..2ff27d549af8 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -4669,7 +4669,7 @@ TESTSUITEDIR = testsuite
 $(TESTSUITEDIR)/site.exp: site.exp
 	-test -d $(TESTSUITEDIR) || mkdir $(TESTSUITEDIR)
 	-rm -f $@
-	sed '/set tmpdir/ s|testsuite|$(TESTSUITEDIR)|' < site.exp > $@
+	sed '/set tmpdir/ s|testsuite$$|$(TESTSUITEDIR)|' < site.exp > $@
 
 # This is only used for check-% targets that aren't parallelized.
 $(filter-out $(lang_checks_parallelized),$(lang_checks)): check-% : site.exp
@@ -4679,7 +4679,7 @@ $(filter-out $(lang_checks_parallelized),$(lang_checks)): check-% : site.exp
 	srcdir=`cd ${srcdir}; ${PWD_COMMAND}` ; export srcdir ; \
 	cd $(TESTSUITEDIR)/$*; \
 	rm -f tmp-site.exp; \
-	sed '/set tmpdir/ s|testsuite|$(TESTSUITEDIR)/$*|' \
+	sed '/set tmpdir/ s|testsuite$$|$(TESTSUITEDIR)/$*|' \
 		< ../../site.exp > tmp-site.exp; \
 	$(SHELL) $${srcdir}/../move-if-change tmp-site.exp site.exp; \
 	EXPECT=${EXPECT} ; export EXPECT ; \
@@ -4766,7 +4766,7 @@ check-parallel-% : site.exp
 	srcdir=`cd ${srcdir}; ${PWD_COMMAND}` ; export srcdir ; \
 	cd $(TESTSUITEDIR)/$(check_p_subdir); \
 	rm -f tmp-site.exp; \
-	sed '/set tmpdir/ s|testsuite|$(TESTSUITEDIR)/$(check_p_subdir)|' \
+	sed '/set tmpdir/ s|testsuite$$|$(TESTSUITEDIR)/$(check_p_subdir)|' \
 		< ../../site.exp > tmp-site.exp; \
 	$(SHELL) $${srcdir}/../move-if-change tmp-site.exp site.exp; \
 	EXPECT=${EXPECT} ; export EXPECT ; \