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.
This commit is contained in:
parent
f4e164aac4
commit
59dd3af6a2
4 changed files with 22 additions and 8 deletions
|
@ -1,3 +1,9 @@
|
|||
2009-06-30 Jan Kratochvil <jan.kratochvil@redhat.com>
|
||||
|
||||
* Makefile.in (TARGET_FLAGS_TO_PASS): Include also FORCE_PARALLEL.
|
||||
(check//%): Construct FORCE_PARALLEL for the sub-make. Extend the
|
||||
comment for it.
|
||||
|
||||
2009-06-30 Paul Pluzhnikov <ppluzhnikov@google.com>
|
||||
|
||||
gdb/10275
|
||||
|
|
|
@ -620,7 +620,8 @@ TARGET_FLAGS_TO_PASS = \
|
|||
"MAKEINFO=$(MAKEINFO)" \
|
||||
"MAKEHTML=$(MAKEHTML)" \
|
||||
"RUNTEST=$(RUNTEST)" \
|
||||
"RUNTESTFLAGS=$(RUNTESTFLAGS)"
|
||||
"RUNTESTFLAGS=$(RUNTESTFLAGS)" \
|
||||
"FORCE_PARALLEL=$(FORCE_PARALLEL)"
|
||||
|
||||
# All source files that go into linking GDB.
|
||||
# Links made at configuration time should not be specified here, since
|
||||
|
@ -885,7 +886,8 @@ check: force
|
|||
# will run 3 concurrent sessions of check, eventually testing all 10
|
||||
# combinations. GNU make is required for the % pattern to work, as is
|
||||
# a shell that expands alternations within braces. If GNU make is not
|
||||
# used, this rule will harmlessly fail to match.
|
||||
# used, this rule will harmlessly fail to match. Used FORCE_PARALLEL to
|
||||
# prevent serialized checking due to the passed RUNTESTFLAGS.
|
||||
check//%: force
|
||||
@if [ -f testsuite/config.status ]; then \
|
||||
rootme=`pwd`; export rootme; \
|
||||
|
@ -905,6 +907,7 @@ check//%: force
|
|||
else :; fi && cd $$testdir && \
|
||||
$(MAKE) $(TARGET_FLAGS_TO_PASS) \
|
||||
RUNTESTFLAGS="--target_board=$$variant $(RUNTESTFLAGS)" \
|
||||
FORCE_PARALLEL=$(if $(FORCE_PARALLEL),1,$(if $(RUNTESTFLAGS),,1)) \
|
||||
"$$target"; \
|
||||
else true; fi
|
||||
|
||||
|
|
|
@ -1,3 +1,11 @@
|
|||
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.
|
||||
|
||||
2009-06-30 Jan Kratochvil <jan.kratochvil@redhat.com>
|
||||
|
||||
* lib/mi-support.exp (mi_check_thread_states): Permit any output before
|
||||
|
|
|
@ -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 \
|
||||
|
|
Loading…
Reference in a new issue