Fix parallel check//% rule in gdb for non-VPATH build.
gdb/: * gdb/Makefile.in (check//%): Parse 'config.status --version' output to recreate the configuration from the testsuite directory, rather than running 'config.status --recheck' from a different build directory. Let configure do the recursion rather than doing it manually.
This commit is contained in:
parent
a58162c257
commit
a5bbabf3b5
|
@ -1,3 +1,11 @@
|
||||||
|
2009-09-08 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
||||||
|
|
||||||
|
* gdb/Makefile.in (check//%): Parse 'config.status --version'
|
||||||
|
output to recreate the configuration from the testsuite directory,
|
||||||
|
rather than running 'config.status --recheck' from a different
|
||||||
|
build directory. Let configure do the recursion rather than
|
||||||
|
doing it manually.
|
||||||
|
|
||||||
2009-09-08 Jan Kratochvil <jan.kratochvil@redhat.com>
|
2009-09-08 Jan Kratochvil <jan.kratochvil@redhat.com>
|
||||||
|
|
||||||
* ia64-tdep.c (ia64_memory_remove_breakpoint): Call do_cleanups
|
* ia64-tdep.c (ia64_memory_remove_breakpoint): Call do_cleanups
|
||||||
|
|
|
@ -888,6 +888,7 @@ check: force
|
||||||
# a shell that expands alternations within braces. If GNU make is not
|
# a shell that expands alternations within braces. If GNU make is not
|
||||||
# used, this rule will harmlessly fail to match. Used FORCE_PARALLEL to
|
# used, this rule will harmlessly fail to match. Used FORCE_PARALLEL to
|
||||||
# prevent serialized checking due to the passed RUNTESTFLAGS.
|
# prevent serialized checking due to the passed RUNTESTFLAGS.
|
||||||
|
# FIXME: use config.status --config not --version, when available.
|
||||||
check//%: force
|
check//%: force
|
||||||
@if [ -f testsuite/config.status ]; then \
|
@if [ -f testsuite/config.status ]; then \
|
||||||
rootme=`pwd`; export rootme; \
|
rootme=`pwd`; export rootme; \
|
||||||
|
@ -896,14 +897,14 @@ check//%: force
|
||||||
variant=`echo "$@" | sed 's,^[^/]*//,,'`; \
|
variant=`echo "$@" | sed 's,^[^/]*//,,'`; \
|
||||||
vardots=`echo "$$variant" | sed 's,/,.,g'`; \
|
vardots=`echo "$$variant" | sed 's,/,.,g'`; \
|
||||||
testdir=testsuite.$$vardots; \
|
testdir=testsuite.$$vardots; \
|
||||||
if [ ! -f $$testdir/Makefile ]; then \
|
if [ ! -f $$testdir/Makefile ] && [ -f testsuite/config.status ]; then \
|
||||||
(cd testsuite && find . -name config.status) | \
|
configargs=`cd testsuite && ./config.status --version | \
|
||||||
sed s,/config.status$$,, | sort | while read subdir; do \
|
sed -n -e 's,"$$,,' -e 's,^ *with options ",,p'`; \
|
||||||
$(SHELL) $(srcdir)/../mkinstalldirs $$testdir/$$subdir && \
|
$(SHELL) $(srcdir)/../mkinstalldirs $$testdir && \
|
||||||
(cd $$testdir/$$subdir && \
|
(cd $$testdir && \
|
||||||
$(SHELL) $$rootme/testsuite/$$subdir/config.status \
|
eval $(SHELL) "\"\$$rootsrc/testsuite/configure\" $$configargs" \
|
||||||
--recheck && \
|
"\"--srcdir=\$$rootsrc/testsuite\"" \
|
||||||
$(SHELL) ./config.status); done; \
|
); \
|
||||||
else :; fi && cd $$testdir && \
|
else :; fi && cd $$testdir && \
|
||||||
$(MAKE) $(TARGET_FLAGS_TO_PASS) \
|
$(MAKE) $(TARGET_FLAGS_TO_PASS) \
|
||||||
RUNTESTFLAGS="--target_board=$$variant $(RUNTESTFLAGS)" \
|
RUNTESTFLAGS="--target_board=$$variant $(RUNTESTFLAGS)" \
|
||||||
|
|
Loading…
Reference in New Issue