From ff1146fb4f7254a8f644f89d7af6b4b566528603 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 28 Oct 2023 01:30:37 +0200 Subject: tests: Adjust to cope with glibc graft. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a followup to 1328c4cca531318e3ed90c6aecb522a5b22a4bcc, which led to failures for tests that were not prepared to cope with that. * tests/guix-environment-container.sh (hello_drv_nested): Pass “-E GUIX_BUILD_OPTIONS” so ‘--no-grafts’ is passed. * tests/guix-pack.sh (GUIX_BUILD_OPTIONS): Add ‘--no-grafts’. * tests/transformations.scm ("options->transformation, with-graft"): Skip when ‘glibc-final’ has a replacement. Change-Id: Ia65c9aeb06f524252815b8290a5ca7bf97ee8136 --- tests/guix-pack.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tests/guix-pack.sh') diff --git a/tests/guix-pack.sh b/tests/guix-pack.sh index 4042e54aeb5..3204e821cfa 100644 --- a/tests/guix-pack.sh +++ b/tests/guix-pack.sh @@ -30,7 +30,9 @@ fi guix pack --version # Use --no-substitutes because we need to verify we can do this ourselves. -GUIX_BUILD_OPTIONS="--no-substitutes" +# Use --no-grafts to avoid interference--e.g., --dry-run passing even when +# given an unsupported package. +GUIX_BUILD_OPTIONS="--no-substitutes --no-grafts" export GUIX_BUILD_OPTIONS test_directory="`mktemp -d`" -- cgit v1.2.3