diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 2be762a3d48..2d99622ec54 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,17 @@ +2013-11-04 Tom Tromey + + * Makefile.in (TEST_DIRS): Remove. + (TEST_TARGETS, check-parallel): Rewrite. + (check-gdb.%, BASE1_FILES, BASE2_FILES, check-gdb.base%) + (subdir_do, subdirs): Remove. + (do-check-parallel, check/%): New targets. + (clean): Remove outputs, temp, and cache directories. + (saw_dash_j): New variable. + (CHECK_TARGET): Use it. + (check): Depend on all, site.exp. Rewrite. + (check-single): Remove dependencies. + (slow_tests, all_tests, reordered_tests): New variables. + 2013-11-04 Tom Tromey * gdb.dwarf2/fission-base.S: Remove "gdb.dwarf/". diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in index a7b3d5cf0fe..46dac133c6f 100644 --- a/gdb/testsuite/Makefile.in +++ b/gdb/testsuite/Makefile.in @@ -128,14 +128,23 @@ $(abs_builddir)/site.exp site.exp: ./config.status Makefile installcheck: -# For GNU make, try to run the tests in parallel. If RUNTESTFLAGS is -# not empty, then by default the tests will be serialized. This can -# be overridden by setting FORCE_PARALLEL to any non-empty value. -# For a non-GNU make, do not parallelize. -@GMAKE_TRUE@CHECK_TARGET = $(if $(FORCE_PARALLEL),check-parallel,$(if $(RUNTESTFLAGS),check-single,check-parallel)) +# See whether -j was given to make. Either it was given with no +# arguments, and appears as "j" in the first word, or it was given an +# argument and appears as "-j" in a separate word. +@GMAKE_TRUE@saw_dash_j = $(or $(findstring j,$(firstword $(MAKEFLAGS))),$(filter -j,$(MAKEFLAGS))) + +# For GNU make, try to run the tests in parallel if any -j option is +# given. If RUNTESTFLAGS is not empty, then by default the tests will +# be serialized. This can be overridden by setting FORCE_PARALLEL to +# any non-empty value. For a non-GNU make, do not parallelize. +@GMAKE_TRUE@CHECK_TARGET = $(if $(FORCE_PARALLEL),check-parallel,$(if $(RUNTESTFLAGS),check-single,$(if $(saw_dash_j),check-parallel,check-single))) @GMAKE_FALSE@CHECK_TARGET = check-single -check: $(CHECK_TARGET) +# Note that we must resort to a recursive make invocation here, +# because GNU make 3.82 has a bug preventing MAKEFLAGS from being used +# in conditions. +check: all $(abs_builddir)/site.exp + $(MAKE) $(CHECK_TARGET) # All the hair to invoke dejagnu. A given invocation can just append # $(RUNTESTFLAGS) @@ -151,70 +160,45 @@ DO_RUNTEST = \ export TCL_LIBRARY ; fi ; \ $(RUNTEST) -check-single: all $(abs_builddir)/site.exp +check-single: $(DO_RUNTEST) $(RUNTESTFLAGS) -# 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_TARGETS = $(addprefix check-,$(TEST_DIRS)) - -# We explicitly re-invoke make here for two reasons. First, it lets -# us add a -k option, which makes the parallel check mimic the -# behavior of the serial check; and second, it means that we can still -# regenerate the sum and log files even if a sub-make fails -- which -# it usually does because dejagnu exits with an error if any test -# fails. check-parallel: - $(MAKE) -k $(TEST_TARGETS); \ + -rm -rf cache + $(MAKE) -k do-check-parallel; \ $(SHELL) $(srcdir)/dg-extract-results.sh \ - $(addsuffix /gdb.sum,$(TEST_DIRS)) > gdb.sum; \ + `find outputs -name gdb.sum -print` > gdb.sum; \ $(SHELL) $(srcdir)/dg-extract-results.sh -L \ - $(addsuffix /gdb.log,$(TEST_DIRS)) > gdb.log + `find outputs -name gdb.log -print` > gdb.log -@GMAKE_TRUE@$(filter-out check-gdb.base%,$(TEST_TARGETS)): check-gdb.%: all $(abs_builddir)/site.exp -@GMAKE_TRUE@ @if test ! -d gdb.$*; then mkdir gdb.$*; fi -@GMAKE_TRUE@ $(DO_RUNTEST) --directory=gdb.$* --outdir=gdb.$* $(RUNTESTFLAGS) +# Turn a list of .exp files into "check/" targets. Only examine .exp +# files appearing in a gdb.* directory -- we don't want to pick up +# lib/ by mistake. For example, gdb.linespec/linespec.exp becomes +# check/gdb.linespec/linespec.exp. The list is generally sorted +# alphabetically, but we take a few tests known to be slow and push +# them to the front of the list to try to lessen the overall time +# taken by the test suite -- if one of these tests happens to be run +# late, it will cause the overall time to increase. +slow_tests = gdb.base/break-interp.exp gdb.base/interp.exp \ + gdb.base/multi-forks.exp +@GMAKE_TRUE@all_tests := $(shell cd $(srcdir) && find gdb.* -name '*.exp' -print) +@GMAKE_TRUE@reordered_tests := $(slow_tests) $(filter-out $(slow_tests),$(all_tests)) +@GMAKE_TRUE@TEST_TARGETS := $(addprefix check/,$(reordered_tests)) -# Each half (roughly) of the .exp files from gdb.base. -BASE1_FILES = $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/gdb.base/[a-m]*.exp)) -BASE2_FILES = $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/gdb.base/[n-z]*.exp)) +do-check-parallel: $(TEST_TARGETS) + @: -# Handle each half of gdb.base. -check-gdb.base%: all $(abs_builddir)/site.exp - @if test ! -d gdb.base$*; then mkdir gdb.base$*; fi - $(DO_RUNTEST) $(BASE$*_FILES) --outdir gdb.base$* $(RUNTESTFLAGS) - -subdir_do: force - @for i in $(DODIRS); do \ - if [ -d ./$$i ] ; then \ - if (rootme=`pwd`/ ; export rootme ; \ - rootsrc=`cd $(srcdir); pwd`/ ; export rootsrc ; \ - cd ./$$i; \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) $(DO)) ; then true ; \ - else exit 1 ; fi ; \ - else true ; fi ; \ - done +@GMAKE_TRUE@check/%.exp: +@GMAKE_TRUE@ -mkdir -p outputs/$* +@GMAKE_TRUE@ @$(DO_RUNTEST) GDB_PARALLEL=yes --outdir=outputs/$* $*.exp $(RUNTESTFLAGS) force:; -subdirs: - for dir in ${ALL_SUBDIRS} ; \ - do \ - echo "$$dir:" ; \ - if [ -d $$dir ] ; then \ - (rootme=`pwd`/ ; export rootme ; \ - rootsrc=`cd $(srcdir); pwd`/ ; export rootsrc ; \ - cd $$dir; $(MAKE) $(TARGET_FLAGS_TO_PASS)); \ - fi; \ - done - clean mostlyclean: -rm -f *~ core *.o a.out xgdb *.x *.grt bigcore.corefile .gdb_history -rm -f core.* *.tf *.cl *.py tracecommandsscript copy1.txt zzz-gdbscript -rm -f *.dwo *.dwp + -rm -rf outputs temp cache if [ x"${ALL_SUBDIRS}" != x ] ; then \ for dir in ${ALL_SUBDIRS}; \ do \