diff mbox

[bug#56758,v2,0/4] Don't try to mkdir XDG_RUNTIME_DIR

Message ID 875yjbi3ji.fsf@trop.in
State Accepted
Headers show

Commit Message

Andrew Tropin Aug. 2, 2022, 6 a.m. UTC 
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(-)

Comments

Ludovic Courtès Aug. 5, 2022, 9:06 a.m. UTC | #1 
Hi Andrew,

Andrew Tropin <andrew@trop.in> skribis:

>   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.

Applied, thanks!

Ludo’.
diff mbox

Patch

From 4c7084308338aa3eaedb3097b43117c421c39580 Mon Sep 17 00:00:00 2001
From: Andrew Tropin <andrew@trop.in>
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