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:
Ralf Wildenhues 2009-09-08 18:50:40 +00:00
parent a58162c257
commit a5bbabf3b5
2 changed files with 17 additions and 8 deletions

View File

@ -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>
* ia64-tdep.c (ia64_memory_remove_breakpoint): Call do_cleanups

View File

@ -888,6 +888,7 @@ check: force
# a shell that expands alternations within braces. If GNU make is not
# used, this rule will harmlessly fail to match. Used FORCE_PARALLEL to
# prevent serialized checking due to the passed RUNTESTFLAGS.
# FIXME: use config.status --config not --version, when available.
check//%: force
@if [ -f testsuite/config.status ]; then \
rootme=`pwd`; export rootme; \
@ -896,14 +897,14 @@ check//%: force
variant=`echo "$@" | sed 's,^[^/]*//,,'`; \
vardots=`echo "$$variant" | sed 's,/,.,g'`; \
testdir=testsuite.$$vardots; \
if [ ! -f $$testdir/Makefile ]; then \
(cd testsuite && find . -name config.status) | \
sed s,/config.status$$,, | sort | while read subdir; do \
$(SHELL) $(srcdir)/../mkinstalldirs $$testdir/$$subdir && \
(cd $$testdir/$$subdir && \
$(SHELL) $$rootme/testsuite/$$subdir/config.status \
--recheck && \
$(SHELL) ./config.status); done; \
if [ ! -f $$testdir/Makefile ] && [ -f testsuite/config.status ]; then \
configargs=`cd testsuite && ./config.status --version | \
sed -n -e 's,"$$,,' -e 's,^ *with options ",,p'`; \
$(SHELL) $(srcdir)/../mkinstalldirs $$testdir && \
(cd $$testdir && \
eval $(SHELL) "\"\$$rootsrc/testsuite/configure\" $$configargs" \
"\"--srcdir=\$$rootsrc/testsuite\"" \
); \
else :; fi && cd $$testdir && \
$(MAKE) $(TARGET_FLAGS_TO_PASS) \
RUNTESTFLAGS="--target_board=$$variant $(RUNTESTFLAGS)" \