mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-17 18:00:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Ralf Wildenhues 2010-01-14 07:20:31 +00:00 committed by Ralf Wildenhues
parent 5bc69b925d
commit 453897b4dd
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/ChangeLog
View File

@ -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

6
gcc/Makefile.in
View File

@ -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 ; \