From patchwork Tue Aug 2 06:00:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Tropin X-Patchwork-Id: 41086 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 89B7727BBEA; Tue, 2 Aug 2022 07:06:55 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 DB78C27BBE9 for ; Tue, 2 Aug 2022 07:06:54 +0100 (BST) Received: from localhost ([::1]:47448 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oIl3N-0000Yh-K6 for patchwork@mira.cbaines.net; Tue, 02 Aug 2022 02:06:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37186) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oIl2Z-0000VX-4f for guix-patches@gnu.org; Tue, 02 Aug 2022 02:06:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52320) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oIl2Y-0002tf-Pi for guix-patches@gnu.org; Tue, 02 Aug 2022 02:06:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oIl2Y-0008Dh-Hd for guix-patches@gnu.org; Tue, 02 Aug 2022 02:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56758] [PATCH v2 0/4] Don't try to mkdir XDG_RUNTIME_DIR References: <87wnc1zfrh.fsf@trop.in> Resent-From: Andrew Tropin Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 02 Aug 2022 06:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56758 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?utf-8?q?Court=C3=A8s?= Cc: 56758@debbugs.gnu.org Received: via spool by 56758-submit@debbugs.gnu.org id=B56758.165942032231548 (code B ref 56758); Tue, 02 Aug 2022 06:06:02 +0000 Received: (at 56758) by debbugs.gnu.org; 2 Aug 2022 06:05:22 +0000 Received: from localhost ([127.0.0.1]:42069 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oIl1t-0008Cl-GL for submit@debbugs.gnu.org; Tue, 02 Aug 2022 02:05:22 -0400 Received: from relay2-d.mail.gandi.net ([217.70.183.194]:53015) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oIl1p-0008CU-2V for 56758@debbugs.gnu.org; Tue, 02 Aug 2022 02:05:20 -0400 Received: (Authenticated sender: andrew@trop.in) by mail.gandi.net (Postfix) with ESMTPSA id 04B4440002; Tue, 2 Aug 2022 06:05:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=gm1; t=1659420311; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to; bh=rWUhI/JRigSbeUHE5Lk/EyDUZ+NEBx3Dm30QzEW/jYM=; b=WB5X46dHYN8NkYJzwAEIoFN1yTdgorCFEKMf/Ud/G/tXkgZHhA15KjZ1qv72+oeeSUc9NX Oft2vVbwg+lxrADJmxvj5vRQNLByDkIeAobfM/GnkRGBimML5DIG4AK8wsOFw9YayC2gZT pszoIb8OY4x0ak/Qw9kSFiee5k4ySn/IsGyfsKVhNMbvGs2M7w+o9iNza39/EaJgUTm6fd JLtSPgKzdRRn8Ucy9Fb6KcvIdwFrcGVJEBjV/RsUz9qZZ3fbESvwsPVLi/NNBDuPx6xerv qUw6WBllvNW+XirNGBzBfmRnKhoA1Br4vziHIeSdcXuUHh3inT1xpIzrh1z5KA== From: Andrew Tropin In-Reply-To: <87r120z36g.fsf@gnu.org> Date: Tue, 2 Aug 2022 09:00:17 +0300 Message-ID: <875yjbi3ji.fsf@trop.in> 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 Changes since v1: - Don't use modules closure. - Use string-append instead of format. - Use warning instead of display. - Hardcode SHELL=bash for home tests inside container. Andrew Tropin (4): home: xdg: Use single @ intsead of @@. home: xdg: Skip mkdir XDG_RUNTIME_DIR in activation script. home: Use warning instead of display. tests: Make tests inside container reproducible. gnu/home/services.scm | 8 +++++--- gnu/home/services/xdg.scm | 25 ++++++++++++++++--------- tests/guix-home.sh | 5 ++++- 3 files changed, 25 insertions(+), 13 deletions(-) From 4c7084308338aa3eaedb3097b43117c421c39580 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Tue, 2 Aug 2022 08:40:31 +0300 Subject: [PATCH v2 4/4] tests: Make tests inside container reproducible. * tests/guix-home.sh: Make tests inside container reproducible. --- tests/guix-home.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/guix-home.sh b/tests/guix-home.sh index 1d1acbfd6e..d5e2dadbb5 100644 --- a/tests/guix-home.sh +++ b/tests/guix-home.sh @@ -107,7 +107,10 @@ EOF if container_supported then - # Run the home in a container. + # Run the home in a container. Always use bash inside container for + # reproducibility of the tests. + # TODO: Make container independent from external environment variables. + SHELL=bash guix home container home.scm -- true ! guix home container home.scm -- false test "$(guix home container home.scm -- echo '$HOME')" = "$HOME" -- 2.37.0