From patchwork Sat Mar 18 14:54:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ting-Wei Lan X-Patchwork-Id: 48114 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 3B8D116EE4; Sat, 18 Mar 2023 15:06:35 +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=-1.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED 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 A8B4F16E4E for ; Sat, 18 Mar 2023 15:06:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pdY8E-0002uu-8C; Sat, 18 Mar 2023 11:06:06 -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 1pdXyU-0001ZW-Gn for guix-patches@gnu.org; Sat, 18 Mar 2023 10:56:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pdXyU-0001ST-3M for guix-patches@gnu.org; Sat, 18 Mar 2023 10:56:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pdXyT-0006Jk-SZ for guix-patches@gnu.org; Sat, 18 Mar 2023 10:56:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62259] [PATCH] tests: Fix guix-home.sh when guix isn't installed Resent-From: Ting-Wei Lan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 18 Mar 2023 14:56:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62259 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62259@debbugs.gnu.org Cc: Ting-Wei Lan X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167915131124206 (code B ref -1); Sat, 18 Mar 2023 14:56:01 +0000 Received: (at submit) by debbugs.gnu.org; 18 Mar 2023 14:55:11 +0000 Received: from localhost ([127.0.0.1]:48865 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pdXxf-0006IL-B1 for submit@debbugs.gnu.org; Sat, 18 Mar 2023 10:55:11 -0400 Received: from lists.gnu.org ([209.51.188.17]:41100) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pdXxd-0006IE-EP for submit@debbugs.gnu.org; Sat, 18 Mar 2023 10:55:09 -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 1pdXxd-0001Qj-47 for guix-patches@gnu.org; Sat, 18 Mar 2023 10:55:09 -0400 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pdXxb-0001F1-FV for guix-patches@gnu.org; Sat, 18 Mar 2023 10:55:08 -0400 Received: by mail-pl1-x632.google.com with SMTP id h8so8111587plf.10 for ; Sat, 18 Mar 2023 07:55:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679151305; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ZfO2kw3nEamjbQ+VH9q9eHFqzckPFvhc1BtvzsGzz1I=; b=KYsdUhxvq9UNyfw2EhvvwCplrG2jp1kj0F+PaCeilDwfcizzFkFwR1hoPknEgEYo5F oEjSUfUE1hUSImfh6a8fCG1uXsXrwCQBf3yz5o/D/hLrQXt+JLCG9W8MNnKpA17UL/Tv oOTg8FoygKqlY/WiMOP+NKuMa17BiraPMP17Aw/xd2li57BYtnDGajV1dmiw8mePdlFa EUsdEP0OW5OPbKTk6VuL0zMKZ0DEsbIHmy/m/K3Sd+q4wuffo+Lwb7QXZYCxnp1tI08a ewcGaBPeVfTlf1r6ucIDtayLa2ZumsGBY8vtOoOTFoi0Ek+arHYQH2LkfMxQGj0x5gVn D0DA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679151305; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ZfO2kw3nEamjbQ+VH9q9eHFqzckPFvhc1BtvzsGzz1I=; b=H+ZKTcXvTQuRsN1r7CtMJpAD+rDMRb5ZRQy3bxjv59DMw5nhKROsoimxepF3chz2I9 /Sw6DRcQxq2zxzArsaClQDtgCo6aQRZbA/BKlccRRzZuKgGV4d1B6t6wH8l2npCv9/6r Xb8S8j9ef8qhON8bVnIGDknZJ2/7FCTpP8/9p+YYYJLe0AD5rNMsWTn+HATutRgD7/e6 Uh2VLS7dkWU078LJ19KadFFJxNk0xn8hmJ1HrcnXhtlEi4dydh08Z7usncHF7P4OGbI4 jkuvgtvIlE6W1POeSLqa9T2O43URvDPaB9lbmfoqOy3ygPDUk+014yN0oi63cA9dfVaB ppww== X-Gm-Message-State: AO0yUKV0yhG5IyUNp7fm5W66khfM8WeeVKfPMtsJxU+57yGKNi7ApdHq Mw+RJF0VCzwWX4zJ4IEGkOfpNCifbds= X-Google-Smtp-Source: AK7set9vrhaO6hyGnlN0TGc5rvfrF6fFKJTPJQxG+ZsVFXTKeFbnTrbRpqN9ivITe1ik07pMNfJs4Q== X-Received: by 2002:a17:902:cec1:b0:1a1:bbd9:837d with SMTP id d1-20020a170902cec100b001a1bbd9837dmr1557838plg.18.1679151305298; Sat, 18 Mar 2023 07:55:05 -0700 (PDT) Received: from lantw44-fedora-builder.. (xdn21o59.ee.ntu.edu.tw. [140.112.21.59]) by smtp.gmail.com with ESMTPSA id c2-20020a170902aa4200b001a1bbe7020esm1017330plr.231.2023.03.18.07.55.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Mar 2023 07:55:05 -0700 (PDT) From: Ting-Wei Lan Date: Sat, 18 Mar 2023 22:54:54 +0800 Message-Id: <20230318145454.89946-1-lantw44@gmail.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::632; envelope-from=lantw44@gmail.com; helo=mail-pl1-x632.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Sat, 18 Mar 2023 11:06:04 -0400 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 * tests/guix-home.sh: Reorder NIX_STORE_DIR variable definition to prevent guix from crashing due to missing /gnu/store. --- tests/guix-home.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: 99114eb63895712d2d3e62c5a83e3a1540438f15 diff --git a/tests/guix-home.sh b/tests/guix-home.sh index 3151f66683..11b068ca43 100644 --- a/tests/guix-home.sh +++ b/tests/guix-home.sh @@ -36,8 +36,8 @@ container_supported () fi } -NIX_STORE_DIR="$(guile -c '(use-modules (guix config))(display %storedir)')" localstatedir="$(guile -c '(use-modules (guix config))(display %localstatedir)')" +NIX_STORE_DIR="$(guile -c '(use-modules (guix config))(display %storedir)')" GUIX_DAEMON_SOCKET="$localstatedir/guix/daemon-socket/socket" export NIX_STORE_DIR GUIX_DAEMON_SOCKET