From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id 2eEjJ+JUYmoMQSoAWB0awg (envelope-from ) for ; Thu, 23 Jul 2026 13:52:34 -0400 Authentication-Results: simark.ca; dkim=pass (2048-bit key; unprotected) header.d=palves.net header.i=@palves.net header.a=rsa-sha256 header.s=dreamhost header.b=KusoWTRE; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 9D40E1E033; Thu, 23 Jul 2026 13:52:34 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-5.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [IPv6:2620:52:6:3111::32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 8443B1E033 for ; Thu, 23 Jul 2026 13:52:33 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7C8274BA23FD for ; Thu, 23 Jul 2026 17:52:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7C8274BA23FD Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=palves.net header.i=@palves.net header.a=rsa-sha256 header.s=dreamhost header.b=KusoWTRE Received: from dog.pear.relay.mailchannels.net (dog.pear.relay.mailchannels.net [23.83.216.48]) by sourceware.org (Postfix) with ESMTPS id 344794BA23CC for ; Thu, 23 Jul 2026 17:51:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 344794BA23CC Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=palves.net Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=palves.net ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 344794BA23CC Authentication-Results: sourceware.org; arc=none smtp.remote-ip=23.83.216.48 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1784829118; cv=none; b=Yo7vglwDSw94b/PIY2yt2tiFDO/35wIBSB/mEa2S+9xjO0dG5tRGjwsGVMeNPgc8yfvY4HWwvLLwtLI74DB0JOxDPDAaQEgEQEZxN3xkhmtS1RYtJ1PdQMYU/gSa+My6d152TgsCuU0eS4dgZPsNBsYhsgnAgkXP/FW7YYWvMfg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1784829118; c=relaxed/simple; bh=29cjuulHpiC3dpjEvVbToYLyCNDWWiLfQDw+UtvxrMI=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=ij605OOJzaPasm20FUMIwikZckKCYIHiUcC6UAcCwuXNS6loCvFNrdoIw2ID8dlY35I2xfhBfS+c6SIs9OoHwyiItM+ulEtoaVOyLYC9SoFWFbRZPCPu+MI3/hr5NAzH3/IuvdJnY1DZ+x+4lPhdPL/oiabNwdhM+nvOTGtvhbQ= ARC-Authentication-Results: i=1; sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=palves.net header.i=@palves.net header.a=rsa-sha256 header.s=dreamhost header.b=KusoWTRE DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 344794BA23CC X-Sender-Id: dreamhost|x-authsender|pedro@palves.net Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 409E04C2430 for ; Thu, 23 Jul 2026 17:51:57 +0000 (UTC) Received: from pdx1-sub0-mail-a242.dreamhost.com (trex-green-0.trex.outbound.svc.cluster.local [100.104.243.149]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id CEA724C189E for ; Thu, 23 Jul 2026 17:51:56 +0000 (UTC) X-Sender-Id: dreamhost|x-authsender|pedro@palves.net X-MC-Relay: Good X-MailChannels-SenderId: dreamhost|x-authsender|pedro@palves.net X-MailChannels-Auth-Id: dreamhost X-Eight-White: 668de99e6e8ef5f4_1784829117175_4179211243 X-MC-Loop-Signature: 1784829117174:1115418552 X-MC-Ingress-Time: 1784829117174 Received: from pdx1-sub0-mail-a242.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.104.243.149 (trex/8.0.2); Thu, 23 Jul 2026 17:51:57 +0000 Received: from localhost (bl20-181-64.dsl.telepac.pt [2.81.181.64]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: pedro@palves.net) by pdx1-sub0-mail-a242.dreamhost.com (Postfix) with ESMTPSA id 4h5dwr2F5Mz103s for ; Thu, 23 Jul 2026 10:51:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=palves.net; s=dreamhost; t=1784829116; bh=obZnx8fYXzut6OjDpmuBsfHEjmbcMdyXmEWpNwXLJFQ=; h=From:To:Subject:Date:Content-Transfer-Encoding; b=KusoWTRE6NBoMz/UN01ewGtOeYyzvXFATGzJkc8StzWVCmikLBA5L6PU2Xekky5e7 o9Ofj7+kmlCDvsqRSyy/Hslos/h/QH0TsGNcIcXuj5/am5PnsgbMRgvQkN8hjODNZF 1bP//sWkd6QCJhffjS62tykBbI8JoiT4wfnR8fSEdik+p7FRh8tLoASQyyt8/y1V1Y Y/E8jGaTQssfr9KXGyQEfiFgzC4zb7LcxVCzQkdwvG41nklmRn+BY7ikPcchXBPvc/ wEnCa8FAYzTr+pr8GGdQuu4Xm3rKqPLyOk1O7ikI66aQ6lS97bvoQ9P4eKcjWixhtq NpLfqHLwEmLGA== From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH 2/4] gdb/testsuite: Factor out dg-extract-results.sh calls Date: Thu, 23 Jul 2026 18:51:29 +0100 Message-ID: <20260723175131.266112-3-pedro@palves.net> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260723175131.266112-1-pedro@palves.net> References: <20260723175131.266112-1-pedro@palves.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org The parallel-testing targets in the testsuite Makefile each combine the per-test gdb.sum / gdb.log files produced by a run into a single combined pair, using contrib/dg-extract-results.sh. The same pair of invocations (once for gdb.sum, once with -L for gdb.log) is copied in check-parallel, check-parallel-racy, and check-all-boards, each only differing in the input and output directories. Factor those invocations into a DG_EXTRACT_RESULTS canned recipe parameterized by the input and output directories, and use it from all three targets. Change-Id: Ia3417c9410b87a415cb9b104efa60d4bfb9ffbc5 --- gdb/testsuite/Makefile.in | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in index f103d7ddd65..fb312583b0e 100644 --- a/gdb/testsuite/Makefile.in +++ b/gdb/testsuite/Makefile.in @@ -254,16 +254,23 @@ check-single-racy: `ls racy_outputs/*/gdb.sum` > racy.sum; \ sed -n '/=== gdb Summary ===/,$$ p' racy.sum +# Combine the individual gdb.sum / gdb.log files found anywhere under +# directory $(1) into a single gdb.sum / gdb.log pair in directory +# $(2), using contrib/dg-extract-results.sh. +define DG_EXTRACT_RESULTS + $(SHELL) $(srcdir)/../../contrib/dg-extract-results.sh \ + `find $(1) -name gdb.sum -print` > $(2)/gdb.sum; \ + $(SHELL) $(srcdir)/../../contrib/dg-extract-results.sh -L \ + `find $(1) -name gdb.log -print` > $(2)/gdb.log +endef + check-parallel: -rm -f *core* -rm -rf cache outputs temp $(MAKE) -k do-check-parallel; \ result=$$?; \ if test -d outputs; then \ - $(SHELL) $(srcdir)/../../contrib/dg-extract-results.sh \ - `find outputs -name gdb.sum -print` > gdb.sum; \ - $(SHELL) $(srcdir)/../../contrib/dg-extract-results.sh -L \ - `find outputs -name gdb.log -print` > gdb.log; \ + $(call DG_EXTRACT_RESULTS,outputs,.); \ $(SHELL) $(srcdir)/lib/dg-add-core-file-count.sh; \ sed -n '/=== gdb Summary ===/,$$ p' gdb.sum; \ fi; \ @@ -282,12 +289,7 @@ check-parallel-racy: for n in `seq $$racyiter` ; do \ $(MAKE) -k do-check-parallel-racy \ RACY_OUTPUT_N=$$n; \ - $(SHELL) $(srcdir)/../../contrib/dg-extract-results.sh \ - `find racy_outputs/$$n -name gdb.sum -print` > \ - racy_outputs/$$n/gdb.sum; \ - $(SHELL) $(srcdir)/../../contrib/dg-extract-results.sh -L \ - `find racy_outputs/$$n -name gdb.log -print` > \ - racy_outputs/$$n/gdb.log; \ + $(call DG_EXTRACT_RESULTS,racy_outputs/$$n,racy_outputs/$$n); \ sed -n '/=== gdb Summary ===/,$$ p' racy_outputs/$$n/gdb.sum; \ done; \ $(srcdir)/analyze-racy-logs.py \ @@ -389,10 +391,7 @@ check-all-boards: all $(abs_builddir)/site.exp "$(TESTS)" \ result=$$?; \ if test -d check-all; then \ - $(SHELL) $(srcdir)/../../contrib/dg-extract-results.sh \ - `find check-all -name gdb.sum -print` > check-all/gdb.sum; \ - $(SHELL) $(srcdir)/../../contrib/dg-extract-results.sh -L \ - `find check-all -name gdb.log -print` > check-all/gdb.log; \ + $(call DG_EXTRACT_RESULTS,check-all,check-all); \ sed -n '/=== gdb Summary ===/,$$ p' check-all/gdb.sum; \ fi; \ exit $$result -- 2.54.0