Fix PR testsuite/42414.

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

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@155880 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 80ab5e6..49edf5b 100644 (file)
--- 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
 2010-01-14  Shujing Zhao  <pearly.zhao@oracle.com>
 
        PR translation/39521

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 6e3b2c1..2ff27d5 100644 (file)
--- 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 $@
 $(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
 
 # 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; \
        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 ; \
                < ../../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; \
        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 ; \
                < ../../site.exp > tmp-site.exp; \
        $(SHELL) $${srcdir}/../move-if-change tmp-site.exp site.exp; \
        EXPECT=${EXPECT} ; export EXPECT ; \