From patchwork Wed Dec 1 15:54:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 34917 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 61FE227BBEA; Wed, 1 Dec 2021 16:01:53 +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_H2,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 31D2A27BBE9 for ; Wed, 1 Dec 2021 16:01:53 +0000 (GMT) Received: from localhost ([::1]:49664 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1msS3M-0007iF-AJ for patchwork@mira.cbaines.net; Wed, 01 Dec 2021 11:01:52 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54338) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1msRxj-0000S5-VB for guix-patches@gnu.org; Wed, 01 Dec 2021 10:56:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:33757) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1msRxj-0006ao-M2 for guix-patches@gnu.org; Wed, 01 Dec 2021 10:56:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1msRxj-0005O6-Ke for guix-patches@gnu.org; Wed, 01 Dec 2021 10:56:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52186] [core-updates-frozen PATCH v2 16/17] gnu: julia-geometrybasics: Fix tests on i686-linux. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 Dec 2021 15:56:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52186 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52186@debbugs.gnu.org Cc: efraim@flashner.co.il, maxim.cournoyer@gmail.com, zimoun Received: via spool by 52186-submit@debbugs.gnu.org id=B52186.163837411120599 (code B ref 52186); Wed, 01 Dec 2021 15:56:03 +0000 Received: (at 52186) by debbugs.gnu.org; 1 Dec 2021 15:55:11 +0000 Received: from localhost ([127.0.0.1]:45295 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1msRwt-0005M5-46 for submit@debbugs.gnu.org; Wed, 01 Dec 2021 10:55:11 -0500 Received: from mail-wr1-f42.google.com ([209.85.221.42]:35762) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1msRwg-0005IX-Kq for 52186@debbugs.gnu.org; Wed, 01 Dec 2021 10:54:58 -0500 Received: by mail-wr1-f42.google.com with SMTP id i5so53327535wrb.2 for <52186@debbugs.gnu.org>; Wed, 01 Dec 2021 07:54:58 -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=4zgtygKwmM6eNNxhgmD0bZxef/Ij/Yzl9O9xSrNR/RU=; b=aGigQrCfH39ouV/Dau1ck2yrGTcK4ZcLnJqbMbO1e0Pfa0j/unNtgu+0ToRVwA8yVv j8DxF+IAho+JkDmYW4AXTUVzipKwg6+vjZptMhbEnoI19TZFuRvGsBdYuGEjDDvWMqFl LMpJsT5gHNnxO8FZ9f7h7QKSUKfM/QMZSRmOztrd6zTG7KY76D/2fbcyJmNX8UVCwoNJ jmSwNTm3iaZ1qJSSZfBdXl0etOI/LwSZohbm0MpOKulj1FE1uqhU1/Anx5ytNsYRJAMK sCFgMJdxtSE4KN2bJ8BKOUElG+GCYKdWdu/VjpzjB7tsrR0FQpZD0R7oKhSZTw4TmG3v HpMg== 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=4zgtygKwmM6eNNxhgmD0bZxef/Ij/Yzl9O9xSrNR/RU=; b=mfqHp06XiVOtfbexvcGvWofnTSQGEdEWUKIQl3WZv82lFx4F/bsu59FIFjnBT2AXp4 8yogBam4p7MQT5tzDjrgWVOKAvc+eOi1zaNhJcIk72Jlk74pGnrSjxdu2zqfLe8OT/cE L7V2dnfaCm2Gke4/w6GCWUFlJtZlwnDwbPXC+aLJ6E4eSc4M04HN9gfJo/e5pM1xhH8v 2W1yua+Pa3YkiQMmwcI/GsM4DrAPpRHD0oiWcNoFFobo5Tao37CZ2JxtBP1r8IUlMlcR zopLXvhqrBernSepLtjOwUTQXYAoHA1/MUTJvPLiiBP0LDOhz8XEycZ5QWjTY7V1BGVJ pYIg== X-Gm-Message-State: AOAM533luDzRNKwFz1cWjR24jVzsUo81qJxKIUtqkiQCo9N9ded66pST wZYWX5vYprOZYigcG6AJvgH1ZXmtOvI= X-Google-Smtp-Source: ABdhPJz6Llk11iV25RIuW5UTqIwZJksN53SkSZ6gHxtoYQiWs7mxdW8VZ0ZHs4C5bRwK7jkq5Uloxw== X-Received: by 2002:adf:ea0c:: with SMTP id q12mr7574472wrm.299.1638374093025; Wed, 01 Dec 2021 07:54:53 -0800 (PST) Received: from localhost.localdomain ([193.48.40.110]) by smtp.gmail.com with ESMTPSA id a10sm1419854wmq.27.2021.12.01.07.54.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Dec 2021 07:54:52 -0800 (PST) From: zimoun Date: Wed, 1 Dec 2021 16:54:41 +0100 Message-Id: <20211201155442.60916-7-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211201155442.60916-1-zimon.toutoune@gmail.com> References: <20211201155442.60916-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 * gnu/packages/julia-xyz (julia-geometrybasics)[arguments]<#:phases>: Conditionally replace the incorrect type in test suite. --- gnu/packages/julia-xyz.scm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 02c652ce28..6638ecf726 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -1988,14 +1988,19 @@ (define-public julia-geometrybasics (lambda _ (substitute* '("Project.toml" "src/GeometryBasics.jl") - ((".*EarCut.*") "")) - #t)) + ((".*EarCut.*") "")))) (add-after 'link-depot 'skip-incompatible-test (lambda _ (substitute* "test/runtests.jl" (("@testset.*MetaT and heterogeneous data.*" all) - (string-append all "return\n"))) - #t))))) + (string-append all "return\n"))))) + ,@(if (string-prefix? "i686" (or (%current-target-system) + (%current-system))) + '((add-after 'unpack 'fix-tests-int32-i686 + (lambda _ + (substitute* "test/runtests.jl" + (("Int64") "Int32"))))) + '())))) (propagated-inputs `(("julia-itertools" ,julia-itertools) ("julia-staticarrays" ,julia-staticarrays)