From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id WKR5KhCbp2GCDQAAgWs5BA (envelope-from ) for ; Wed, 01 Dec 2021 16:56:00 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 8IoiJhCbp2ELagAAB5/wlQ (envelope-from ) for ; Wed, 01 Dec 2021 15:56:00 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 7A0CDBA77 for ; Wed, 1 Dec 2021 16:56:00 +0100 (CET) Received: from localhost ([::1]:37774 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1msRxf-00086p-LS for larch@yhetil.org; Wed, 01 Dec 2021 10:55:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53946) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1msRwm-0007AO-Dp for guix-patches@gnu.org; Wed, 01 Dec 2021 10:55:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:33731) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1msRwm-0006Hp-5T for guix-patches@gnu.org; Wed, 01 Dec 2021 10:55:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1msRwm-0005KB-4j for guix-patches@gnu.org; Wed, 01 Dec 2021 10:55:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52186] [core-updates-frozen PATCH v2 05/17] gnu: julia-configurations: 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:55:04 +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.163837406420289 (code B ref 52186); Wed, 01 Dec 2021 15:55:04 +0000 Received: (at 52186) by debbugs.gnu.org; 1 Dec 2021 15:54:24 +0000 Received: from localhost ([127.0.0.1]:45250 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1msRw8-0005HA-9q for submit@debbugs.gnu.org; Wed, 01 Dec 2021 10:54:24 -0500 Received: from mail-wm1-f49.google.com ([209.85.128.49]:39906) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1msRw4-0005Fg-VX for 52186@debbugs.gnu.org; Wed, 01 Dec 2021 10:54:21 -0500 Received: by mail-wm1-f49.google.com with SMTP id n33-20020a05600c502100b0032fb900951eso58398wmr.4 for <52186@debbugs.gnu.org>; Wed, 01 Dec 2021 07:54:20 -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=/gT97ZouqlfTlxJ8wRfohLAC0M7SXRjnjcMyupDB5pw=; b=KlWa5Ko54O4QRobx2JELh7MOZ9ot2T7CCpTWjSsgidz5s/qlg7rnYpNCupbV3PK1uj ikNnKRev0pp1utiTE33iAL2x7bCN/KWUdTA74Be1A5fDN+BUrs+lsZhUL7eUs7hMsnh9 gfs3DMeWj4y8Z8TesznPMgPPjk6G7E3RF7TWVKm8eu1BF+UNzfgyLola465QhJzzvHJx 7QSWHf33nkYB/qyySjHOOl+5+MOW+NTCKdVVDzd7XBm/u/wKzOEa0ppnZefigOZJSg3r itMrAv+Z8tqeQpP0j7zDuwOPLzKi45/4CuZhnp6b/YBdRa4QyY+VUeasYUZYBt4L0yQU xIYQ== 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=/gT97ZouqlfTlxJ8wRfohLAC0M7SXRjnjcMyupDB5pw=; b=2/PeXfsM+3LSWC2HI3H3Rz1gHAH+41zsHzHgjUGpy1mX6mrZsw40Mf7UPUfNJEwJ9h CB3a3fBJEqSHqSkNqXZfvwXMJCiBaiTET03ImiGsEKtI6Z9BJme3CrYsHNviIvBD9N+I KQCR+l+uPiV9TMfrtAmQ1nySkqTIsXQFAZPZ6Evn+Micn2hBcybISlhoghsnlXfQzXFS IOgwQVshqnWivR6C6DxO/Hn83AOw1hVVIsHJiGkuTPBA/IRrynDca7fi0BajBNs9gQ/f KZgrCGwmZMd4Ckjlss7SHe9wodc1DaxMkwsG77Ph7FC3puTlofzwcuwg0DMMInhqbMoy WPZQ== X-Gm-Message-State: AOAM531Jw2BgRc0Rr9mkntdkrT9ZFc9RPlKTqQqvvWGCl6E+cHCotfWD rUo1AtgZES3F8zhf0O8Orzy4W0rhwz8= X-Google-Smtp-Source: ABdhPJzsmaqZK1GYc3JeikHyy2BL/HmI84ZgL6EROEBC6UMWCA6bmexutdEL+D3hetmNwM0/ctJ0oQ== X-Received: by 2002:a05:600c:4e94:: with SMTP id f20mr7912424wmq.119.1638374055389; Wed, 01 Dec 2021 07:54:15 -0800 (PST) Received: from localhost.localdomain ([193.48.40.110]) by smtp.gmail.com with ESMTPSA id j40sm150903wms.16.2021.12.01.07.54.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Dec 2021 07:54:15 -0800 (PST) From: zimoun Date: Wed, 1 Dec 2021 16:53:51 +0100 Message-Id: <20211201155355.60845-5-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211201155355.60845-1-zimon.toutoune@gmail.com> References: <20211201155355.60845-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1638374160; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=/gT97ZouqlfTlxJ8wRfohLAC0M7SXRjnjcMyupDB5pw=; b=L2/3HrjtW4TwmrSPZ+yWGtXU3oMun7zA2tKdfT8GKcSywBwHuxHClmbEQXFa+be7uSIbyI R6kk/5ul/jTntNGj/VYShPv/0dU8yvAhymudE+oL22DgLeCZydWRTEGfBLq+AnuKE1tSn2 MrqXfqTn2LFKw0Pf8Bc2Z7Tf1YEvMWQTZF58oEd3bgD6QnLrNkxfwiLRfg0G5/VJvvv8ww lAYrMf5f+YWsmT1A7yPKPro33eHDGoJrsnnOgo4pspwEF9CZjm4+TG3MBmsAqKWl8IBKz7 CMgJl9n+m1uUCL+7K1B3p327gmPikCsCMlFTTwn6kEhuAi88VBIr3jc9ct8/Rg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1638374160; a=rsa-sha256; cv=none; b=CP6gMjcYNM4wU0nEb3OkrR5LbVEFNYBalho5syQc9ODAItjsHEknLnx1gFSV5xRul+A6Fv hv8EJzJGYrCDH22k0V5BNqL6Wop2tDUNUkjzS9w7Qm4e9Lw9x2rUQezaBboggrSvWaAf6d Qhz/5Zak0dW1/X/N8PWG2+ZaAzbAbhtD5cXLbd1EyCj/rTEnm3nx8//Bd9dSf8bql+3lg5 K/o3c3at/UlUqhIoArRhUY44ecU/EqhL1g63i0t25NYmj6uz3ok9I80E/xmWAnc/NW2Y+h vq7CS2eIu5s8+sC5wEY0fXNL32sDU8NIPuReYDB7OjpS1DoHeNZSaBjHPLEjLQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=KlWa5Ko5; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 0.19 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=KlWa5Ko5; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 7A0CDBA77 X-Spam-Score: 0.19 X-Migadu-Scanner: scn0.migadu.com X-TUID: G79fF2hideuJ * gnu/packages/julia-xyz.scm (julia-configurations)[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 f5d2f69997..d673045033 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -804,8 +804,7 @@ (define-public julia-configurations (add-after 'link-depot 'fix-tests (lambda _ (substitute* "test/runtests.jl" - (("option.toml") "test/option.toml")) - #t)) + (("option.toml") "test/option.toml")))) (add-after 'link-depot 'dont-use-exproniconlite (lambda _ (substitute* '("Project.toml" @@ -814,8 +813,14 @@ (define-public julia-configurations (("ExproniconLite") "Expronicon")) (substitute* "Project.toml" (("55351af7-c7e9-48d6-89ff-24e801d99491") - "6b7a57c9-7cc1-4fdf-b7f5-e857abae3636")) - #t))))) + "6b7a57c9-7cc1-4fdf-b7f5-e857abae3636")))) + ,@(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-crayons" ,julia-crayons) ("julia-expronicon" ,julia-expronicon) -- 2.32.0