From patchwork Wed Feb 23 13:47:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 37417 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 9749827BBEA; Wed, 23 Feb 2022 13:49:04 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable 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 65E1E27BBE9 for ; Wed, 23 Feb 2022 13:49:04 +0000 (GMT) Received: from localhost ([::1]:48470 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMs0t-0004IH-H6 for patchwork@mira.cbaines.net; Wed, 23 Feb 2022 08:49:03 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41246) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMrzv-00039I-Gj for guix-patches@gnu.org; Wed, 23 Feb 2022 08:48:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50442) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nMrzv-0004up-6F for guix-patches@gnu.org; Wed, 23 Feb 2022 08:48:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nMrzv-0004iX-4h for guix-patches@gnu.org; Wed, 23 Feb 2022 08:48:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54088] [PATCH v2 04/19] build: julia-build-system: Fix corner-case for parallel tests. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 23 Feb 2022 13:48:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54088 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54088@debbugs.gnu.org Cc: zimoun Received: via spool by 54088-submit@debbugs.gnu.org id=B54088.164562406617943 (code B ref 54088); Wed, 23 Feb 2022 13:48:03 +0000 Received: (at 54088) by debbugs.gnu.org; 23 Feb 2022 13:47:46 +0000 Received: from localhost ([127.0.0.1]:44315 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nMrzd-0004f3-CC for submit@debbugs.gnu.org; Wed, 23 Feb 2022 08:47:46 -0500 Received: from mail-wm1-f50.google.com ([209.85.128.50]:46015) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nMrza-0004dZ-5F for 54088@debbugs.gnu.org; Wed, 23 Feb 2022 08:47:43 -0500 Received: by mail-wm1-f50.google.com with SMTP id az26-20020a05600c601a00b0037c078db59cso4383682wmb.4 for <54088@debbugs.gnu.org>; Wed, 23 Feb 2022 05:47:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HyXgeqQ1QVFMqhpQsQk9k83FcEWjoerZJ6yfanWkMZg=; b=diIO3HSt+xgWtvhAW+a8GQ1CYRqnpDKetHPMpaN5iWeK/BPCbBYrtyHnrPDV9CE2RR HO1u3zhzFH0KHcspT36vo1BUr1D2USbGorwe8lf4kfWgeoRz7JU/d7L25SwmJjajIaR+ P5emFMDf70SbqMcwFCgr6yIxnPyFYHfAwu/XkY/LKVQdcPzVF456GjVx6wBfCHrZkqRv q6o8phOCkiZfp1hiKutCUW0k6R9V5cZgWt/jQSOFHOmChZRdZc8AkTXZ+Wp88h0yZFOb HO7qpNjfwtIdVu+J1Uuhz0sSXA5FljX5g8dPxJ71cKfjy6NSRNoXIqZAwvTRES8lJd/v 9BHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HyXgeqQ1QVFMqhpQsQk9k83FcEWjoerZJ6yfanWkMZg=; b=Z+Kew485FoIVKWXELBipEilSG6d36+Lj7OEPPuflU0dMliYppEQS/pC6DYAO0cxHRI 5/ncDb02CKr6pDXMQSshbZyx/47pKPEZcBVMd60uINmIZrgzWWDScnK5i14FnipMkbbc FW9jgPZ2G73FXjkfF3/ZXdon3xwryHS7JEhJlq9fUcQr5VznzCdMMcBRl//ylqwUCmfH 4ZvkcxLrIpYZDXQeH7hxwLmy98WPag3MzSEquabsxtWQTkDTb/NEcfDcVxHwNR0ff/wg Ditp5hcK5sGaAuGSKOMjG3ClwkTpggHTnzIGPZLFPanzFanyHhRHf/3/ES4GTUqUdosq +AwA== X-Gm-Message-State: AOAM533bRdsJ8UbIizZRmbwzkBwHjie9h/opVucqfz729jC0tqmKa+N5 ht25T4LMyzFlsedabI1XA8Y7ZESrCoM= X-Google-Smtp-Source: ABdhPJzNFqsE1Bb5Jn/rvicCVNI67+ZAig9ahqqcDunAd6tJIW2tZItAHQ6bQfmMqpf9KJ+5Ek9RRw== X-Received: by 2002:a05:600c:3b06:b0:37c:3ce4:9a31 with SMTP id m6-20020a05600c3b0600b0037c3ce49a31mr7693945wms.192.1645624056366; Wed, 23 Feb 2022 05:47:36 -0800 (PST) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id d6sm55823135wrs.85.2022.02.23.05.47.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Feb 2022 05:47:35 -0800 (PST) From: zimoun Date: Wed, 23 Feb 2022 14:47:07 +0100 Message-Id: <20220223134722.354636-4-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220223134722.354636-1-zimon.toutoune@gmail.com> References: <20220223134722.354636-1-zimon.toutoune@gmail.com> 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" X-getmail-retrieved-from-mailbox: Patches * guix/build/julia-build-system.scm (check): Do not run parallel tests when '--cores=1'. --- guix/build/julia-build-system.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/guix/build/julia-build-system.scm b/guix/build/julia-build-system.scm index c5ad65d029..b0dac154e9 100644 --- a/guix/build/julia-build-system.scm +++ b/guix/build/julia-build-system.scm @@ -112,9 +112,9 @@ (define* (check #:key tests? source inputs outputs julia-package-name (job-count (if parallel-tests? (parallel-job-count) 1)) - ;; The --proc argument of Julia *adds* extra processors rather than - ;; specify the exact count to use, so zero must be specified to - ;; disable parallel processing... + ;; The --procs argument of Julia *adds* extra processors rather + ;; than specify the exact count to use, so zero must be specified + ;; to disable parallel processing... (additional-procs (max 0 (1- job-count)))) ;; With a patch, SOURCE_DATE_EPOCH is honored (setenv "SOURCE_DATE_EPOCH" "1") @@ -127,7 +127,7 @@ (define* (check #:key tests? source inputs outputs julia-package-name (setenv "HOME" "/tmp") (apply invoke "julia" `("--depwarn=yes" - ,@(if parallel-tests? + ,@(if (and parallel-tests? (< 0 additional-procs)) ;; XXX: ... but '--procs' doesn't accept 0 as a valid ;; value, so just omit the argument entirely. (list (string-append "--procs="