Message ID | 54204C74.90509@redhat.com |
---|---|
State | New |
Headers | show |
On Mon, Sep 22, 2014 at 12:21:08PM -0400, Jason Merrill wrote: > On 09/22/2014 11:58 AM, Jakub Jelinek wrote: > >LGTM (though, supposedly we want similar change in > >libstdc++-v3/testsuite/Makefile.am). > >Or, if people would really like to see the commands, we could print them > >just once, using e.g. > > -$(if $(check_p_subno),@)(rootme= ... > >(then e.g. check-parallel-gcc goal would print the command, but > >check-parallel-gcc-1 or check-parallel-gcc-112 would not). > > So, like this? Ok, thanks. > commit c750897381a3f936e27cabd825cfa85ce936a6a9 > Author: Jason Merrill <jason@redhat.com> > Date: Mon Sep 22 11:44:00 2014 -0400 > > gcc/ > * Makefile.in (check-parallel-%): Add @. > libstdc++-v3/ > * testsuite/Makefile.am (%/site.exp): Add @. > (check-DEJAGNU): Likewise. > * testsuite/Makefile.in: Regenerate. > > diff --git a/gcc/Makefile.in b/gcc/Makefile.in > index 6f251a5..97b439a 100644 > --- 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/testsuite/Makefile.am b/libstdc++-v3/testsuite/Makefile.am > index e206aba..b4c9e85 100644 > --- 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 59060b8..0fc26f4 100644 > --- 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; \ Jakub
commit c750897381a3f936e27cabd825cfa85ce936a6a9 Author: Jason Merrill <jason@redhat.com> Date: Mon Sep 22 11:44:00 2014 -0400 gcc/ * Makefile.in (check-parallel-%): Add @. libstdc++-v3/ * testsuite/Makefile.am (%/site.exp): Add @. (check-DEJAGNU): Likewise. * testsuite/Makefile.in: Regenerate. diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 6f251a5..97b439a 100644 --- 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/testsuite/Makefile.am b/libstdc++-v3/testsuite/Makefile.am index e206aba..b4c9e85 100644 --- 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 59060b8..0fc26f4 100644 --- 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; \