Makefile.in (check-parallel-%): Add @.

gcc/
	* Makefile.in (check-parallel-%): Add @.
libstdc++-v3/
	* testsuite/Makefile.am (%/site.exp): Add @.
	(check-DEJAGNU): Likewise.
	* testsuite/Makefile.in: Regenerate.

From-SVN: r215474

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c1e6d21e7cf28f4007d2d8f92f09c761a8267f21..721027c472126da7fdd2fed00ae32f2963a206e1 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2014-09-22  Jason Merrill  <jason@redhat.com>
+
+       * Makefile.in (check-parallel-%): Add @.
+
 2014-09-22  James Greenhalgh  <james.greenhalgh@arm.com>
 
        * config/aarch64/geniterators.sh: New.

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 6f251a517387e51c59f94a4ad6629603021f4a77..97b439ac4144594b5fe0e42bd75d65c7becb454b 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -3674,10 +3674,10 @@ $(lang_checks_parallelized): check-% : site.exp
        fi
 
 check-parallel-% : site.exp
-       -test -d plugin || mkdir plugin
-       -test -d $(TESTSUITEDIR) || mkdir $(TESTSUITEDIR)
-       test -d $(TESTSUITEDIR)/$(check_p_subdir) || mkdir $(TESTSUITEDIR)/$(check_p_subdir)
-       -(rootme=`${PWD_COMMAND}`; export rootme; \
+       -@test -d plugin || mkdir plugin
+       -@test -d $(TESTSUITEDIR) || mkdir $(TESTSUITEDIR)
+       @test -d $(TESTSUITEDIR)/$(check_p_subdir) || mkdir $(TESTSUITEDIR)/$(check_p_subdir)
+       -$(if $(check_p_subno),@)(rootme=`${PWD_COMMAND}`; export rootme; \
        srcdir=`cd ${srcdir}; ${PWD_COMMAND}` ; export srcdir ; \
        if [ -n "$(check_p_subno)" ] \
           && [ -n "$$GCC_RUNTEST_PARALLELIZE_DIR" ] \

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 5cd422e4a1191c16f0d5d6abc77d2770490cd2e0..f06ae8ef15f140b4c5814578792a2a67b415c9c3 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2014-09-22  Jason Merrill  <jason@redhat.com>
+
+       * testsuite/Makefile.am (%/site.exp): Add @.
+       (check-DEJAGNU): Likewise.
+       * testsuite/Makefile.in: Regenerate.
+
 2014-09-22  Jonathan Wakely  <jwakely@redhat.com>
 
        * include/bits/stl_queue.h: Include missing header.

diff --git a/libstdc++-v3/testsuite/Makefile.am b/libstdc++-v3/testsuite/Makefile.am
index e206aba4ce6aff646a15222e9c6d8a0636a92e3c..b4c9e853dcf84f00a678a9f6610a61244ba020e6 100644 (file)
--- a/libstdc++-v3/testsuite/Makefile.am
+++ b/libstdc++-v3/testsuite/Makefile.am
@@ -91,9 +91,9 @@ new-abi-baseline:
          ${extract_symvers} ../src/.libs/libstdc++.so $${output})
 
 %/site.exp: site.exp
-       -test -d $* || mkdir $*
+       -@test -d $* || mkdir $*
        @srcdir=`cd $(srcdir); ${PWD_COMMAND}`;
-       objdir=`${PWD_COMMAND}`/$*; \
+       @objdir=`${PWD_COMMAND}`/$*; \
        sed -e "s|^set srcdir .*$$|set srcdir $$srcdir|" \
            -e "s|^set objdir .*$$|set objdir $$objdir|" \
            site.exp > $*/site.exp.tmp
@@ -115,7 +115,7 @@ $(check_DEJAGNU_normal_targets): check-DEJAGNUnormal%: normal%/site.exp
 
 # Run the testsuite in normal mode.
 check-DEJAGNU $(check_DEJAGNU_normal_targets): check-DEJAGNU%: site.exp
-       AR="$(AR)"; export AR; \
+       $(if $*,@)AR="$(AR)"; export AR; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        if [ -z "$*" ] && [ "$(filter -j, $(MFLAGS))" = "-j" ]; then \
          rm -rf normal-parallel || true; \

diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in
index 59060b8db0112bf01b64e12f0c635bc07b81f143..0fc26f437799b311c7984e3e16e5c3537d4e1f5c 100644 (file)
--- a/libstdc++-v3/testsuite/Makefile.in
+++ b/libstdc++-v3/testsuite/Makefile.in
@@ -553,9 +553,9 @@ new-abi-baseline:
          ${extract_symvers} ../src/.libs/libstdc++.so $${output})
 
 %/site.exp: site.exp
-       -test -d $* || mkdir $*
+       -@test -d $* || mkdir $*
        @srcdir=`cd $(srcdir); ${PWD_COMMAND}`;
-       objdir=`${PWD_COMMAND}`/$*; \
+       @objdir=`${PWD_COMMAND}`/$*; \
        sed -e "s|^set srcdir .*$$|set srcdir $$srcdir|" \
            -e "s|^set objdir .*$$|set objdir $$objdir|" \
            site.exp > $*/site.exp.tmp
@@ -566,7 +566,7 @@ $(check_DEJAGNU_normal_targets): check-DEJAGNUnormal%: normal%/site.exp
 
 # Run the testsuite in normal mode.
 check-DEJAGNU $(check_DEJAGNU_normal_targets): check-DEJAGNU%: site.exp
-       AR="$(AR)"; export AR; \
+       $(if $*,@)AR="$(AR)"; export AR; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        if [ -z "$*" ] && [ "$(filter -j, $(MFLAGS))" = "-j" ]; then \
          rm -rf normal-parallel || true; \