From 86ef36f655d13cd39ff573de079b35a142f8cf42 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 24 Oct 2022 00:56:46 +0545 Subject: [PATCH] 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 --- sim/Makefile.in | 2 +- sim/testsuite/local.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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; \ -- 2.30.2