This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: PATCH: testsuite/25741: Gcc testsuite isn't parallel build
You're right, my mistake, I just did a blind substitution. Here's a
new version. Tested again with a bootstrap and "make -j2 -k check"
Index: gcc/Makefile.in
===================================================================
--- gcc/Makefile.in (revision 109828)
+++ gcc/Makefile.in (working copy)
@@ -4008,10 +4008,10 @@
rm -f tmp-site.exp; \
sed '/set tmpdir/ s|testsuite|$(TESTSUITEDIR)/$*|' \
< ../../site.exp > tmp-site.exp; \
- $(SHELL) $(srcdir)/../move-if-change tmp-site.exp site.exp; \
+ $(SHELL) $${srcdir}/../move-if-change tmp-site.exp site.exp; \
EXPECT=${EXPECT} ; export EXPECT ; \
if [ -f $${rootme}/../expect/expect ] ; then \
- TCL_LIBRARY=`cd .. ; cd ${srcdir}/../tcl/library ;
${PWD_COMMAND}` ; \
+ TCL_LIBRARY=`cd .. ; cd $${srcdir}/../tcl/library ;
${PWD_COMMAND}` ; \
export TCL_LIBRARY ; fi ; \
$(RUNTEST) --tool $* $(RUNTESTFLAGS))
@@ -4021,7 +4021,7 @@
cd testsuite; \
EXPECT=${EXPECT} ; export EXPECT ; \
if [ -f $${rootme}/../expect/expect ] ; then \
- TCL_LIBRARY=`cd .. ; cd ${srcdir}/../tcl/library ;
${PWD_COMMAND}` ; \
+ TCL_LIBRARY=`cd .. ; cd $${srcdir}/../tcl/library ;
${PWD_COMMAND}` ; \
export TCL_LIBRARY ; fi ; \
$(RUNTEST) --tool consistency $(RUNTESTFLAGS)
On 1/17/06, Daniel Jacobowitz <drow@false.org> wrote:
> On Tue, Jan 17, 2006 at 09:46:45AM -0800, Developer Foo wrote:
> > 2006-01-17 Shantonu Sen <ssen@opendarwin.org>
> >
> > * Makefile.in (check-%, check-consistency): Use ${abs_srcdir},
> > since a relative path to ${srcdir} is not valid after changing to
> > the lang-specific testsuite directory
>
> I'm confused. The description makes sense. But how can this patch do
> anything?
>
> > - srcdir=`cd ${srcdir}; ${PWD_COMMAND}` ; export srcdir ; \
> > + abs_srcdir=`cd ${abs_srcdir}; ${PWD_COMMAND}` ; export abs_srcdir ; \
>
> srcdir had better have already been absolute.
>
> > - $(SHELL) $(srcdir)/../move-if-change tmp-site.exp site.exp; \
> > + $(SHELL) $(abs_srcdir)/../move-if-change tmp-site.exp site.exp; \
>
> This is the real bug, and below. Don't use $(srcdir) or ${srcdir}, use
> $${srcdir}.
>
> --
> Daniel Jacobowitz
> CodeSourcery
>