From 98efb6c77b4b91bfbc04b457c6ae53dcfe76e7dd Mon Sep 17 00:00:00 2001 From: Romain GARBAGE Date: Fri, 20 Jun 2025 10:29:20 +0200 Subject: tests: Improve guix-pack-relocatable.sh. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch fixes a regression introduced by c9abfacd9f. See https://issues.guix.gnu.org/76240#2. * tests/guix-pack-relocatable.sh (tarball): Improve flaky test. Change-Id: Ife1cbe6b6b9a22f2442e4ecb3a093c4b874bc4e1 Signed-off-by: Ludovic Courtès --- tests/guix-pack-relocatable.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/guix-pack-relocatable.sh b/tests/guix-pack-relocatable.sh index 2fc9fde0bd..aea02e16f6 100644 --- a/tests/guix-pack-relocatable.sh +++ b/tests/guix-pack-relocatable.sh @@ -216,7 +216,12 @@ chmod -Rf +w "$test_directory"; rm -rf "$test_directory"/* # Ensure '-R' applies to propagated inputs. Failing to do that, it would fail # with a profile collision error in this case because 'python-scipy' # propagates 'python-numpy'. See . -guix pack -RR python-numpy python-scipy --no-grafts -n +# +# 'python-scipy' depends on the package defined with the Guile variable +# 'python-numpy' but the package specification 'python-numpy' doesn't always +# refer to the same package (e.g. when multiple versions are defined) so the +# Guile variable is directly referred to. +guix pack -RR -e '(@ (gnu packages python-xyz) python-numpy)' python-scipy --no-grafts -n # Check that packages that mix executable and support files (e.g. git) in the # "binary" directories still work after wrapped. -- cgit v1.2.3