[patch] Fix parallel gdb/ make check//%

[patch] Fix parallel gdb/ make check//%

[Jan Kratochvil]

Hi,

running from gdb/
	make check//unix/-m32

/home/jkratoch/redhat/gdb-master/gdb/testsuite.unix.-m32/../../gdb/gdb version  6.8.50.20090630-cvs -nw -nx 
make[2]: *** [check-gdb.base1] Error 1
make[2]: Leaving directory `/home/jkratoch/redhat/gdb-master/gdb/testsuite.unix.-m32'
dg-extract-results.sh: file gdb.gdb/gdb.sum does not exist.
dg-extract-results.sh: file gdb.gdb/gdb.log does not exist.
make[1]: *** [check-parallel] Error 1
make[1]: Leaving directory `/home/jkratoch/redhat/gdb-master/gdb/testsuite.unix.-m32'
make: *** [check//unix/-m32] Error 2

Now I see only with the previous patch.
	[patch] Enable parallel make check also from gdb/
	http://sourceware.org/ml/gdb-patches/2009-06/msg00879.html

Currently there were:
missing optional @SUBDIRS@: gdb.stabs gdb.gdbtk gdb.hp
missing static: gdb.gdb gdn.modulas gdb.reverse

I may miss the original code goal.


Thanks,
Jan


gdb/testsuite/
2009-06-30  Jan Kratochvil  <jan.kratochvil@redhat.com>

	* Makefile.in (TEST_DIRS): Use $(ALL_SUBDIRS).

diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in
index 5344418..72b8634 100644
--- a/gdb/testsuite/Makefile.in
+++ b/gdb/testsuite/Makefile.in
@@ -153,7 +153,7 @@ check-single: all site.exp
 # A list of all directories named "gdb.*" which also hold a .exp file.
 # We filter out gdb.base and add fake entries, because that directory
 # takes the longest to process, and so we split it in half.
-TEST_DIRS = gdb.base1 gdb.base2 $(filter-out gdb.base,$(sort $(notdir $(patsubst %/,%,$(dir $(wildcard $(srcdir)/gdb.*/*.exp))))))
+TEST_DIRS = gdb.base1 gdb.base2 $(filter-out gdb.base,$(ALL_SUBDIRS))
 
 TEST_TARGETS = $(addprefix check-,$(TEST_DIRS))
 

Re: [patch] Fix parallel gdb/ make check//%

[Tom Tromey]

>>>>> "Jan" == Jan Kratochvil <jan.kratochvil@redhat.com> writes:

Jan> Currently there were:
Jan> missing optional @SUBDIRS@: gdb.stabs gdb.gdbtk gdb.hp
Jan> missing static: gdb.gdb gdn.modulas gdb.reverse

Jan> I may miss the original code goal.

I think the existing sub-sub configury stuff is just weird.  I am not
sure what the point of it is; by default, runtest just runs all the
.exp files it finds, and I didn't see anything that would change that.

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.

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))

The original code here tries to mimic what runtest does: run all the
.exp files that match the tool name.  We're generally passing
--directory to runtest in the parallel case, so this finds all the
directories holding .exp files.

I think the new patch must not be right.  What runs gdb.modula2?
Or gdb.gdb?  AFAICT neither of these ever ends up in ALL_SUBDIRS.

I don't really understand what caused the error you saw.  The code is
intended to make the output directories as it goes (see the .dir
dependencies) and all the subdirs should be made and tested before
dg-extract-results.sh is invoked.

Tom

Re: [patch] Fix parallel gdb/ make check//%

[Jan Kratochvil]

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  <jan.kratochvil@redhat.com>

	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 \

Re: [patch] Fix parallel gdb/ make check//%

[Tom Tromey]

>>>>> "Jan" == Jan Kratochvil <jan.kratochvil@redhat.com> writes:

Tom> I don't really understand what caused the error you saw.

Jan> VPATH.  Hopefully this patch is OK.

Jan> 	Fix `make check//%' target after `make check' has been ran.
Jan> 	* Makefile.in (TEST_TARGETS): Remove the %/.dir dependency.  Add
Jan> 	a mkdir call.
Jan> 	(check-gdb.base%): Remove the gdb.base%/.dir dependency.
Jan> 	(%/.dir): Remove.

Ok.  Thanks.

Tom

Re: [patch] Fix parallel gdb/ make check//%

[Jan Kratochvil]

On Tue, 30 Jun 2009 23:11:40 +0200, Tom Tromey wrote:
> >>>>> "Jan" == Jan Kratochvil <jan.kratochvil@redhat.com> writes:
> Jan> 	Fix `make check//%' target after `make check' has been ran.
> Jan> 	* Makefile.in (TEST_TARGETS): Remove the %/.dir dependency.  Add
> Jan> 	a mkdir call.
> Jan> 	(check-gdb.base%): Remove the gdb.base%/.dir dependency.
> Jan> 	(%/.dir): Remove.
> 
> Ok.  Thanks.

Checked-in:
	http://sourceware.org/ml/gdb-cvs/2009-06/msg00205.html


Thanks,
Jan