From patchwork Wed Mar 27 14:52:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 62281 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2006A27BBEA; Wed, 27 Mar 2024 14:54:21 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9B85B27BBE2 for ; Wed, 27 Mar 2024 14:54:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpUfD-0000vh-T3; Wed, 27 Mar 2024 10:54:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rpUfC-0000vJ-LL for guix-patches@gnu.org; Wed, 27 Mar 2024 10:54:02 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rpUfC-0008If-Cf for guix-patches@gnu.org; Wed, 27 Mar 2024 10:54:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rpUfC-0000qI-H2 for guix-patches@gnu.org; Wed, 27 Mar 2024 10:54:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70031] [core-updates PATCH 01/19] build-system/cmake: Parallelize tests using ctest. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Mar 2024 14:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70031 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70031@debbugs.gnu.org Cc: Greg Hogan Received: via spool by 70031-submit@debbugs.gnu.org id=B70031.17115512032979 (code B ref 70031); Wed, 27 Mar 2024 14:54:02 +0000 Received: (at 70031) by debbugs.gnu.org; 27 Mar 2024 14:53:23 +0000 Received: from localhost ([127.0.0.1]:38095 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpUeZ-0000lw-Cu for submit@debbugs.gnu.org; Wed, 27 Mar 2024 10:53:23 -0400 Received: from mail-qt1-x835.google.com ([2607:f8b0:4864:20::835]:56455) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpUeW-0000lC-Pa for 70031@debbugs.gnu.org; Wed, 27 Mar 2024 10:53:21 -0400 Received: by mail-qt1-x835.google.com with SMTP id d75a77b69052e-4317aed91baso7255251cf.0 for <70031@debbugs.gnu.org>; Wed, 27 Mar 2024 07:53:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20230601.gappssmtp.com; s=20230601; t=1711551195; x=1712155995; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vSV/m+fZSZ2oZAmhMJWdeartF1Aeh8ioIhXRzGDCFqs=; b=A2FecrohKR+qaJXOWKxB6atKjnzKhJsy3gx5jzRtBVwXD8LB9iWtAQ6MFEitERBLeA 0Ft0hVTW/SB9ToVU/S4CyXxIelqGFmJUEbuetzoOzPeIMJ0UbmdrWEIvnw6Tv3nwq/Lx kqh9l+p6wq7KrPs9Pv0y7fHPi1Wi7e+LNLSTa0qTHzDcC2iBPm2Tx2B1z98ZUzF/FYtT uJHQGZzWBr4V619xOrTUw7iFjgNvjGlE4wHK6Ih/i2Cxs3Xyh4T2hc8epwM2cG61gMbE bVZc3wRaYp1qe0i7kWLCDkhSxnqDz9pgwse50vMrcd13aXItMUpgJ1b7Ru5c0NIv0mNd auYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711551195; x=1712155995; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vSV/m+fZSZ2oZAmhMJWdeartF1Aeh8ioIhXRzGDCFqs=; b=TDDIB3tzwxujA6hNUyQgzl+rt0y23ZjUbAjwQAU1n1Z9fywwxpGM5sZpOGNEqiJzrU o8DuMH6V6COStzSpnJzayTjpjdbnroNedReXhFciiX7aUdU9EDnccnXHqmigsT9ysmHm 8nbNFdqxBqUQ7wXg9RTtJPPU7WlCyjM2Is8MWG9zz9W2x6NT7fSZ8DMuU9qgLWNp34Ax uDjEs/9/Sjg7l9TddKbRHp3QZEUwRrpW51xHElFye4knsCQ0GBotDv5hx20V8oKeyT0R uXGCpM+J9zve8x42wEzg5BynpPqqxJfC8DzlxJJJAWpXAQ8py3RKEoqEKtidYCpE0LS1 wlkg== X-Gm-Message-State: AOJu0YwY3DlV/fHtpd7pqz0taAS5aneBSk+su7haY3Cn9A7ZpfoQGlSS DP45bOXv//ygXPtIP+KmQR9AkaM3zMvZN1mjGRLH414EndwG2g/E/emsaMJTIMQx/9Xok1Mcplb B X-Google-Smtp-Source: AGHT+IGXW/qUi9moZYCL5p5t6k34GOZV7dA/r1z6lugrX/OWIBBTlYpWv4jh7OBtoM7izTzNjYzlUQ== X-Received: by 2002:a05:622a:547:b0:431:5cfc:c238 with SMTP id m7-20020a05622a054700b004315cfcc238mr1559974qtx.28.1711551194700; Wed, 27 Mar 2024 07:53:14 -0700 (PDT) Received: from ip-10-114-89-186.evoforge.org (ec2-52-70-167-183.compute-1.amazonaws.com. [52.70.167.183]) by smtp.gmail.com with ESMTPSA id fk23-20020a05622a559700b00430c8b87b46sm4882915qtb.6.2024.03.27.07.53.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Mar 2024 07:53:14 -0700 (PDT) From: Greg Hogan Date: Wed, 27 Mar 2024 14:52:26 +0000 Message-ID: X-Mailer: git-send-email 2.44.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/build/cmake-build-system.scm (check): Replace call to gnu-build's non-parallelizable check with an implementation using cmake's ctest. --- guix/build/cmake-build-system.scm | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/guix/build/cmake-build-system.scm b/guix/build/cmake-build-system.scm index d1ff5071be5..ea342ff2ac9 100644 --- a/guix/build/cmake-build-system.scm +++ b/guix/build/cmake-build-system.scm @@ -23,6 +23,7 @@ (define-module (guix build cmake-build-system) #:use-module ((guix build gnu-build-system) #:prefix gnu:) #:use-module (guix build utils) #:use-module (ice-9 match) + #:use-module (srfi srfi-34) #:export (%standard-phases cmake-build)) @@ -77,12 +78,25 @@ (define* (configure #:key outputs (configure-flags '()) (out-of-source? #t) (format #t "running 'cmake' with arguments ~s~%" args) (apply invoke "cmake" args)))) -(define* (check #:key (tests? #t) (parallel-tests? #t) (test-target "test") +(define %test-suite-log-regexp + ;; Name of test suite log files as commonly found in CMake. + "^LastTestFailed\\.log$") + +(define* (check #:key (tests? #t) (parallel-tests? #t) + (test-suite-log-regexp %test-suite-log-regexp) #:allow-other-keys) - (let ((gnu-check (assoc-ref gnu:%standard-phases 'check))) - (setenv "CTEST_OUTPUT_ON_FAILURE" "1") - (gnu-check #:tests? tests? #:test-target test-target - #:parallel-tests? parallel-tests?))) + (if tests? + (guard (c ((invoke-error? c) + ;; Dump the test suite log to facilitate debugging. + (display "\nTest suite failed, dumping logs.\n" + (current-error-port)) + (gnu:dump-file-contents "." test-suite-log-regexp) + (raise c))) + (apply invoke "ctest" "--output-on-failure" + `(,@(if parallel-tests? + `("-j" ,(number->string (parallel-job-count))) + '())))) + (format #t "test suite not run~%"))) (define %standard-phases ;; Everything is as with the GNU Build System except for the `configure'