From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 27146 invoked by alias); 30 Jun 2009 20:50:17 -0000 Received: (qmail 27133 invoked by uid 22791); 30 Jun 2009 20:50:16 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_34,J_CHICKENPOX_43,SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: sourceware.org Received: from mx2.redhat.com (HELO mx2.redhat.com) (66.187.237.31) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 30 Jun 2009 20:50:08 +0000 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n5UKo6pL006605 for ; Tue, 30 Jun 2009 16:50:06 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n5UKo5Gw025041; Tue, 30 Jun 2009 16:50:05 -0400 Received: from host0.dyn.jankratochvil.net (sebastian-int.corp.redhat.com [172.16.52.221]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n5UKo3Lx001282; Tue, 30 Jun 2009 16:50:04 -0400 Received: from host0.dyn.jankratochvil.net (localhost [127.0.0.1]) by host0.dyn.jankratochvil.net (8.14.3/8.14.3) with ESMTP id n5UKo3E8016032; Tue, 30 Jun 2009 22:50:03 +0200 Received: (from jkratoch@localhost) by host0.dyn.jankratochvil.net (8.14.3/8.14.3/Submit) id n5UKo3LD016031; Tue, 30 Jun 2009 22:50:03 +0200 Date: Tue, 30 Jun 2009 20:50:00 -0000 From: Jan Kratochvil To: Tom Tromey Cc: gdb-patches@sourceware.org Subject: Re: [patch] Fix parallel gdb/ make check//% Message-ID: <20090630205003.GA15673@host0.dyn.jankratochvil.net> References: <20090630174650.GB24648@host0.dyn.jankratochvil.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.19 (2009-01-05) 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-06/txt/msg00893.txt.bz2 On Tue, 30 Jun 2009 21:49:49 +0200, Tom Tromey wrote: > I'd like to nuke all the subdir Makefiles and configure stuff below > testsuite. It is a lot of stuff that does very little -- it doesn't > even really do the one thing it is intended to do. OK, I see it now. > Jan> -TEST_DIRS = gdb.base1 gdb.base2 $(filter-out gdb.base,$(sort $(notdir $(patsubst %/,%,$(dir $(wildcard $(srcdir)/gdb.*/*.exp)))))) > Jan> +TEST_DIRS = gdb.base1 gdb.base2 $(filter-out gdb.base,$(ALL_SUBDIRS)) I only limited the number of directories to run hiding the real problem. > I don't really understand what caused the error you saw. VPATH. Hopefully this patch is OK. Thanks, Jan gdb/testsuite/ 2009-06-30 Jan Kratochvil Fix `make check//%' target after `make check' has been ran. * Makefile.in (TEST_TARGETS): Remove the %/.dir dependency. Add a mkdir call. (check-gdb.base%): Remove the gdb.base%/.dir dependency. (%/.dir): Remove. --- a/gdb/testsuite/Makefile.in +++ b/gdb/testsuite/Makefile.in @@ -170,7 +170,8 @@ check-parallel: $(SHELL) $(srcdir)/dg-extract-results.sh -L \ $(addsuffix /gdb.log,$(TEST_DIRS)) > gdb.log -$(filter-out check-gdb.base%,$(TEST_TARGETS)): check-gdb.%: all site.exp gdb.%/.dir +$(filter-out check-gdb.base%,$(TEST_TARGETS)): check-gdb.%: all site.exp + @if test ! -d gdb.$*; then mkdir gdb.$*; fi $(DO_RUNTEST) --directory=gdb.$* --outdir=gdb.$* $(RUNTESTFLAGS) # Each half (roughly) of the .exp files from gdb.base. @@ -178,14 +179,10 @@ BASE1_FILES = $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/gdb.base/[a-m]*.exp) BASE2_FILES = $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/gdb.base/[n-z]*.exp)) # Handle each half of gdb.base. -check-gdb.base%: all site.exp gdb.base%/.dir +check-gdb.base%: all site.exp @if test ! -d gdb.base$*; then mkdir gdb.base$*; fi $(DO_RUNTEST) $(BASE$*_FILES) --outdir gdb.base$* $(RUNTESTFLAGS) -%/.dir: - @-if test ! -d $*; then mkdir $*; fi - @echo > $@ - subdir_do: force @for i in $(DODIRS); do \ if [ -d ./$$i ] ; then \