From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id C399E3857030 for ; Sun, 23 Oct 2022 21:01:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C399E3857030 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org Received: by smtp.gentoo.org (Postfix, from userid 559) id 503ED341029; Sun, 23 Oct 2022 21:01:49 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH] sim: testsuite: improve parallel test processing Date: Mon, 24 Oct 2022 01:32:22 +0545 Message-Id: <20221023194722.23905-1-vapier@gentoo.org> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00,GIT_PATCH_0,JMQ_SPF_NEUTRAL,KAM_DMARC_STATUS,SPF_HELO_PASS,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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. --- sim/Makefile.in | 9 +++++---- sim/testsuite/local.mk | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/sim/testsuite/local.mk b/sim/testsuite/local.mk index b8114a565997..cee51f24ae0f 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) -- 2.37.3