From patchwork Tue Jul 30 20:19:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 66561 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 5692F27BBE9; Tue, 30 Jul 2024 21:21:06 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED 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 03BB627BBE2 for ; Tue, 30 Jul 2024 21:21:04 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sYtL1-0005Li-LU; Tue, 30 Jul 2024 16:20:51 -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 1sYtKy-0005LP-QC for guix-patches@gnu.org; Tue, 30 Jul 2024 16:20:48 -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 1sYtKy-0003QW-3A for guix-patches@gnu.org; Tue, 30 Jul 2024 16:20:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=Po2qnIBFofr75rJqZZLG2cDgo5UlMj29/Ahxa9po2uU=; b=evg+qDaWyEujTzXSGlTH+R5cZR7hVXLcEc92AP3D5tQ4uyBCEeBOntqMrHtFvpk9O3UyMgalpaNAAHrJTb6qhit8yhqq5JlPgUUoSDkmO3WiNcK3QkggrZQu4HlDeiB0qZGyYrRAQsXYb1AegOANTdFYyrUVqLDan5bfE3faPbQYccH36M5cYs2PA8bN/OFg/QZMlh43qnHAabFKEQbR/N+V8d9PXr97CaFF4939Kkkblv1hzJgp7TThII1u5OMJl9JTh5U1flaZj5Jq1FvuZgOfNFyVqot/GX33EkulqSgr/dulMerdMg44iJKFX+01eHgtFDIX2K1FqtN6MAR7JA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sYtLC-0007Rn-I1 for guix-patches@gnu.org; Tue, 30 Jul 2024 16:21:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72362] [PATCH 1/2] tests: gexp: Handle incorrect guile-bootstrap version for riscv. References: <87plqv2ml6.fsf@cbaines.net> In-Reply-To: <87plqv2ml6.fsf@cbaines.net> Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 30 Jul 2024 20:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72362 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72362@debbugs.gnu.org Received: via spool by 72362-submit@debbugs.gnu.org id=B72362.172237082528575 (code B ref 72362); Tue, 30 Jul 2024 20:21:02 +0000 Received: (at 72362) by debbugs.gnu.org; 30 Jul 2024 20:20:25 +0000 Received: from localhost ([127.0.0.1]:48581 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sYtKa-0007Qp-Tb for submit@debbugs.gnu.org; Tue, 30 Jul 2024 16:20:25 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43974) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sYtKZ-0007Qf-4h for 72362@debbugs.gnu.org; Tue, 30 Jul 2024 16:20:23 -0400 Received: from localhost (136.249.6.51.dyn.plus.net [51.6.249.136]) by mira.cbaines.net (Postfix) with ESMTPSA id 8433327BBE2 for <72362@debbugs.gnu.org>; Tue, 30 Jul 2024 21:19:37 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 4da4cc78 for <72362@debbugs.gnu.org>; Tue, 30 Jul 2024 20:19:37 +0000 (UTC) From: Christopher Baines Date: Tue, 30 Jul 2024 21:19:35 +0100 Message-ID: <97135935a85d4b8133369a9222ab3a8bf53c14c7.1722370776.git.mail@cbaines.net> X-Mailer: git-send-email 2.45.2 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 The tests currently fail when run on riscv-linux (affecting the guix package) because Guile 3 is used as the bootstrap guile. Correcting the package version seems hard, so I'm just tweaking the tests to use the right effective version for riscv64-linux. * tests/gexp.scm (bootstrap-guile-effective-version): New procedure. ("gexp->derivation & with-extensions", "lower-gexp", "lower-gexp, raw-derivation-file"): Use bootstrap-guile-effective-version. Change-Id: I3995e1f6b58ada1baf38a8ec55b0173059dd0079 --- tests/gexp.scm | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) base-commit: d8217355f2691a92a3c64fea939827a314952a77 diff --git a/tests/gexp.scm b/tests/gexp.scm index 905009caee..b35bfc920f 100644 --- a/tests/gexp.scm +++ b/tests/gexp.scm @@ -47,6 +47,13 @@ (define-module (test-gexp) (define %store (open-connection-for-tests)) +(define (bootstrap-guile-effective-version) + ;; TODO The package version of %bootstrap-guile is incorrect for + ;; riscv64-linux + (if (string=? "riscv64-linux" (%current-system)) + "3.0" + (package-version %bootstrap-guile))) + ;; Globally disable grafts because they can trigger early builds. (%graft? #f) @@ -1099,8 +1106,8 @@ (define %extension-package (write (list the-answer (multiply 2)) port))))))) (drv (gexp->derivation "thingie" build - ;; %BOOTSTRAP-GUILE is 2.0. - #:effective-version "2.0")) + #:effective-version + (bootstrap-guile-effective-version))) (out -> (derivation->output-path drv))) (mbegin %store-monad (built-derivations (list drv)) @@ -1120,7 +1127,8 @@ (define %extension-package mkdir-p the-answer)))) (lexp (lower-gexp exp - #:effective-version "2.0"))) + #:effective-version + (bootstrap-guile-effective-version)))) (define (matching-input drv output) (lambda (input) (and (eq? (derivation-input-derivation input) drv) @@ -1134,12 +1142,15 @@ (define %extension-package (lowered-gexp-inputs lexp)) (member (string-append (derivation->output-path extension-drv) - "/share/guile/site/2.0") + "/share/guile/site/" + (bootstrap-guile-effective-version)) (lowered-gexp-load-path lexp)) (= 2 (length (lowered-gexp-load-path lexp))) (member (string-append (derivation->output-path extension-drv) - "/lib/guile/2.0/site-ccache") + "/lib/guile/" + (bootstrap-guile-effective-version) + "/site-ccache") (lowered-gexp-load-compiled-path lexp)) (= 2 (length (lowered-gexp-load-compiled-path lexp))) (eq? (derivation-input-derivation (lowered-gexp-guile lexp)) @@ -1149,7 +1160,10 @@ (define %extension-package (mlet* %store-monad ((thing -> (program-file "prog" #~(display "hi!"))) (exp -> #~(list #$(raw-derivation-file thing))) (drv (lower-object thing)) - (lexp (lower-gexp exp #:effective-version "2.0"))) + (lexp (lower-gexp + exp + #:effective-version + (bootstrap-guile-effective-version)))) (return (and (equal? `(list ,(derivation-file-name drv)) (lowered-gexp-sexp lexp)) (equal? (list (derivation-file-name drv))