Fix PR testsuite/42414.

Ralf Wildenhues Ralf.Wildenhues@gmx.de
Sat Jan 9 08:54:00 GMT 2010


This seems easy, and fairly obvious.  Tested by running
  make -k check
  make -k -j2 check

in gcc/ after a bootstrap.  OK for trunk?

Thanks,
Ralf

Fix PR testsuite/42414.

gcc/ChangeLog:
2010-01-09  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.

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 082da07..d6a57c4 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 ; \



More information about the Gcc-patches mailing list