aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2022-10-24 01:30:18 +0545
committerMike Frysinger <vapier@gentoo.org>2022-10-26 14:38:44 +0545
commit8f97b519fb061a7243344905cc23a77adda6be7a (patch)
tree0b762dea78c6aef554621c4f755655d03eed6253
parentf84ffabbb304853a6570656200dfbd32e732386f (diff)
downloadgdb-8f97b519fb061a7243344905cc23a77adda6be7a.zip
gdb-8f97b519fb061a7243344905cc23a77adda6be7a.tar.gz
gdb-8f97b519fb061a7243344905cc23a77adda6be7a.tar.bz2
sim: testsuite: improve parallel test processing
The current logic limits itself to a maxdepth of 4 when looking for results. This wouldn't be a problem if cris didn't have a testsuite at a depth of 5 which we end up ignoring when summarizing. Rather than bump the number from 4 to 5, rework the code so that we gather the exact set of tests that we tried to run.
-rw-r--r--sim/Makefile.in9
-rw-r--r--sim/testsuite/local.mk9
2 files changed, 10 insertions, 8 deletions
diff --git a/sim/Makefile.in b/sim/Makefile.in
index 18e84e5..f471289 100644
--- a/sim/Makefile.in
+++ b/sim/Makefile.in
@@ -2474,13 +2474,14 @@ check/%.exp:
check-DEJAGNU-parallel:
$(AM_V_at)( \
- $(MAKE) -k \
- `cd $(srcdir)/testsuite && find . -name '*.exp' -printf 'check/%P '`; \
+ set -- `cd $(srcdir)/testsuite && find . -name '*.exp' -printf '%P\n' | sed 's:[.]exp$$::'`; \
+ $(MAKE) -k `printf 'check/%s.exp ' $$@`; \
ret=$$?; \
+ set -- `printf 'testsuite/%s/ ' $$@`; \
$(SHELL) $(srcroot)/contrib/dg-extract-results.sh \
- `find testsuite/ -maxdepth 4 -name testrun.sum | sort` > testrun.sum; \
+ `find $$@ -maxdepth 1 -name testrun.sum 2>/dev/null | sort` > testrun.sum; \
$(SHELL) $(srcroot)/contrib/dg-extract-results.sh -L \
- `find testsuite/ -maxdepth 4 -name testrun.log | sort` > testrun.log; \
+ `find $$@ -maxdepth 1 -name testrun.log 2>/dev/null | sort` > testrun.log; \
echo; \
$(SED) -n '/^.*===.*Summary.*===/,$$p' testrun.sum; \
exit $$ret)
diff --git a/sim/testsuite/local.mk b/sim/testsuite/local.mk
index b8114a5..cee51f2 100644
--- a/sim/testsuite/local.mk
+++ b/sim/testsuite/local.mk
@@ -50,13 +50,14 @@ check/%.exp:
check-DEJAGNU-parallel:
$(AM_V_at)( \
- $(MAKE) -k \
- `cd $(srcdir)/testsuite && find . -name '*.exp' -printf 'check/%P '`; \
+ set -- `cd $(srcdir)/testsuite && find . -name '*.exp' -printf '%P\n' | sed 's:[.]exp$$::'`; \
+ $(MAKE) -k `printf 'check/%s.exp ' $$@`; \
ret=$$?; \
+ set -- `printf 'testsuite/%s/ ' $$@`; \
$(SHELL) $(srcroot)/contrib/dg-extract-results.sh \
- `find testsuite/ -maxdepth 4 -name testrun.sum | sort` > testrun.sum; \
+ `find $$@ -maxdepth 1 -name testrun.sum 2>/dev/null | sort` > testrun.sum; \
$(SHELL) $(srcroot)/contrib/dg-extract-results.sh -L \
- `find testsuite/ -maxdepth 4 -name testrun.log | sort` > testrun.log; \
+ `find $$@ -maxdepth 1 -name testrun.log 2>/dev/null | sort` > testrun.log; \
echo; \
$(SED) -n '/^.*===.*Summary.*===/,$$p' testrun.sum; \
exit $$ret)