From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19458 invoked by alias); 9 Nov 2009 17:33:34 -0000 Received: (qmail 19450 invoked by uid 22791); 9 Nov 2009 17:33:34 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,SARE_MSGID_LONG40,SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: sourceware.org Received: from smtp-out.google.com (HELO smtp-out.google.com) (216.239.45.13) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 09 Nov 2009 17:33:30 +0000 Received: from zps38.corp.google.com (zps38.corp.google.com [172.25.146.38]) by smtp-out.google.com with ESMTP id nA9HXSGx007124 for ; Mon, 9 Nov 2009 09:33:28 -0800 Received: from ewy27 (ewy27.prod.google.com [10.241.103.27]) by zps38.corp.google.com with ESMTP id nA9HWiSc005865 for ; Mon, 9 Nov 2009 09:33:25 -0800 Received: by ewy27 with SMTP id 27so3188697ewy.47 for ; Mon, 09 Nov 2009 09:33:24 -0800 (PST) MIME-Version: 1.0 Received: by 10.216.87.14 with SMTP id x14mr2621837wee.127.1257788003907; Mon, 09 Nov 2009 09:33:23 -0800 (PST) In-Reply-To: <20091109171950.GA6665@host0.dyn.jankratochvil.net> References: <20091109171950.GA6665@host0.dyn.jankratochvil.net> Date: Mon, 09 Nov 2009 17:33:00 -0000 Message-ID: Subject: Re: [patch] Fix parallel gdb/ make check//% site.exp From: Doug Evans To: Jan Kratochvil Cc: Tom Tromey , gdb-patches@sourceware.org Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-System-Of-Record: true X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2009-11/txt/msg00144.txt.bz2 On Mon, Nov 9, 2009 at 9:19 AM, Jan Kratochvil wrote: > > gdb/testsuite/ > 2009-11-09 =A0Jan Kratochvil =A0 > > =A0 =A0 =A0 =A0* Makefile.in (abs_builddir): New. > =A0 =A0 =A0 =A0(site.exp): New target `$(abs_builddir)/site.exp'. =A0New = comment. > =A0 =A0 =A0 =A0(check-single, $(TEST_TARGETS), check-gdb.base%): Change `= site.exp' to > =A0 =A0 =A0 =A0`$(abs_builddir)/site.exp'. > > --- a/gdb/testsuite/Makefile.in > +++ b/gdb/testsuite/Makefile.in > @@ -22,6 +22,7 @@ VPATH =3D @srcdir@ > =A0srcdir =3D @srcdir@ > =A0prefix =3D @prefix@ > =A0exec_prefix =3D @exec_prefix@ > +abs_builddir =3D @abs_builddir@ > > =A0target_alias =3D @target_noncanonical@ > =A0program_transform_name =3D @program_transform_name@ > @@ -102,7 +103,11 @@ install: > > =A0uninstall: force > > -site.exp: ./config.status Makefile > +# Use absolute `site.exp' path everywhere to suppress VPATH lookups for = it. > +# $(RUNTEST) is looking up `site.exp' only in the current directory. > +# Bare `site.exp' is present as a target here if user requests it explic= itly. > + > +$(abs_builddir)/site.exp site.exp: ./config.status Makefile > =A0 =A0 =A0 =A0@echo "Making a new config file..." > =A0 =A0 =A0 =A0-@rm -f ./tmp? > =A0 =A0 =A0 =A0@touch site.exp > @@ -147,7 +151,7 @@ DO_RUNTEST =3D \ > =A0 =A0 =A0 =A0 =A0export TCL_LIBRARY ; fi ; \ > =A0 =A0 =A0 =A0$(RUNTEST) > > -check-single: all site.exp > +check-single: all $(abs_builddir)/site.exp > =A0 =A0 =A0 =A0$(DO_RUNTEST) $(RUNTESTFLAGS) > > =A0# A list of all directories named "gdb.*" which also hold a .exp file. > @@ -170,7 +174,7 @@ check-parallel: > =A0 =A0 =A0 =A0$(SHELL) $(srcdir)/dg-extract-results.sh -L \ > =A0 =A0 =A0 =A0 =A0$(addsuffix /gdb.log,$(TEST_DIRS)) > gdb.log > > -$(filter-out check-gdb.base%,$(TEST_TARGETS)): check-gdb.%: all site.exp > +$(filter-out check-gdb.base%,$(TEST_TARGETS)): check-gdb.%: all $(abs_bu= ilddir)/site.exp > =A0 =A0 =A0 =A0@if test ! -d gdb.$*; then mkdir gdb.$*; fi > =A0 =A0 =A0 =A0$(DO_RUNTEST) --directory=3Dgdb.$* --outdir=3Dgdb.$* $(RUN= TESTFLAGS) > > @@ -179,7 +183,7 @@ BASE1_FILES =3D $(patsubst $(srcdir)/%,%,$(wildcard $= (srcdir)/gdb.base/[a-m]*.exp) > =A0BASE2_FILES =3D $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/gdb.base= /[n-z]*.exp)) > > =A0# Handle each half of gdb.base. > -check-gdb.base%: all site.exp > +check-gdb.base%: all $(abs_builddir)/site.exp > =A0 =A0 =A0 =A0@if test ! -d gdb.base$*; then mkdir gdb.base$*; fi > =A0 =A0 =A0 =A0$(DO_RUNTEST) $(BASE$*_FILES) --outdir gdb.base$* $(RUNTES= TFLAGS) > > Thanks. I didn't know about abs_builddir. At Cygnus we had a general rule of keeping trees configured with relative paths movable, and I always forget whether we care about that anymore. OOC, does that impinge on this or do we no longer care about such things?