sim: testsuite: tweak parallel find invocation [PR sim/29596]

Make sure we invoke runtest with the same exp filenames when running in
parallel as it will find when run single threaded.  When `runtest` finds
files itself, it will use paths like "aarch64/allinsn.exp".  When we run
`find .` with the %p option, it produces "./aarch64/allinsn.exp".  Switch
to %P to get "aarch64/allinsn.exp".

Bug: https://sourceware.org/PR29596

diff --git a/sim/Makefile.in b/sim/Makefile.in
index 7845a333fca6cabd684c0dc79fe56a5ac6d0accf..7e18bd161b44aab38e1e6a839642108f8ad01af4 100644 (file)
--- a/sim/Makefile.in
+++ b/sim/Makefile.in
@@ -2473,7 +2473,7 @@ check/%.exp:
 check-DEJAGNU-parallel:
        $(AM_V_at)( \
        $(MAKE) -k \
-         `cd $(srcdir)/testsuite && find . -name '*.exp' -printf 'check/%p '`; \
+         `cd $(srcdir)/testsuite && find . -name '*.exp' -printf 'check/%P '`; \
        ret=$$?; \
        $(SHELL) $(srcroot)/contrib/dg-extract-results.sh \
          `find testsuite/ -maxdepth 4 -name testrun.sum | sort` > testrun.sum; \

diff --git a/sim/testsuite/local.mk b/sim/testsuite/local.mk
index c1799c728ae7f853de9350c12581a1b636a401a5..e55f8c3c8b229f2810af22e06c9050ccc0322cdc 100644 (file)
--- a/sim/testsuite/local.mk
+++ b/sim/testsuite/local.mk
@@ -49,7 +49,7 @@ check/%.exp:
 check-DEJAGNU-parallel:
        $(AM_V_at)( \
        $(MAKE) -k \
-         `cd $(srcdir)/testsuite && find . -name '*.exp' -printf 'check/%p '`; \
+         `cd $(srcdir)/testsuite && find . -name '*.exp' -printf 'check/%P '`; \
        ret=$$?; \
        $(SHELL) $(srcroot)/contrib/dg-extract-results.sh \
          `find testsuite/ -maxdepth 4 -name testrun.sum | sort` > testrun.sum; \