From 59dd3af6a2407e6ed3cfcb9b3b6f711cc7aba0ec Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Tue, 30 Jun 2009 21:23:38 +0000 Subject: gdb/ * Makefile.in (TARGET_FLAGS_TO_PASS): Include also FORCE_PARALLEL. (check//%): Construct FORCE_PARALLEL for the sub-make. Extend the comment for it. gdb/testsuite/ 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. --- gdb/testsuite/ChangeLog | 8 ++++++++ gdb/testsuite/Makefile.in | 9 +++------ 2 files changed, 11 insertions(+), 6 deletions(-) (limited to 'gdb/testsuite') diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 54a97dc..1897d89 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,13 @@ 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. + +2009-06-30 Jan Kratochvil + * lib/mi-support.exp (mi_check_thread_states): Permit any output before the expected result record. diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in index 5344418..c574e23 100644 --- 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 \ -- cgit v1.1