From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 23 Oct 2022 19:11:46 +0000 (+0545)
Subject: sim: testsuite: tweak parallel find invocation [PR sim/29596]
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=86ef36f655d13cd39ff573de079b35a142f8cf42;p=binutils-gdb.git

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 7845a333fca..7e18bd161b4 100644
--- 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 c1799c728ae..e55f8c3c8b2 100644
--- 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; \