From 442a6ff5eae094f1fd4e09241a2f35c33ab908da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 2 Mar 2016 14:44:18 +0100 Subject: tests: Disable grafts by default. Fixes . Reported by myglc2 . * test-env.in: Define and export 'GUIX_BUILD_OPTIONS'. * tests/guix-build.sh: When setting 'GUIX_BUILD_OPTIONS', make sure it contains '--no-grafts'. * tests/guix-package.sh: Likewise. * tests/guix-daemon.sh: Add (%graft? #f) in Scheme snippets. --- tests/guix-package.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'tests/guix-package.sh') diff --git a/tests/guix-package.sh b/tests/guix-package.sh index cf1a185590..d75008448b 100644 --- a/tests/guix-package.sh +++ b/tests/guix-package.sh @@ -261,7 +261,7 @@ unset GUIX_PACKAGE_PATH # Using 'GUIX_BUILD_OPTIONS'. available="`guix package -A | sort`" -GUIX_BUILD_OPTIONS="--dry-run" +GUIX_BUILD_OPTIONS="--dry-run --no-grafts" export GUIX_BUILD_OPTIONS # Make sure $GUIX_BUILD_OPTIONS is not simply appended to the command-line, @@ -270,7 +270,9 @@ available2="`guix package -A | sort`" test "$available2" = "$available" guix package -I -unset GUIX_BUILD_OPTIONS +# Restore '--no-grafts', which makes sure we don't end up building stuff when +# '--dry-run' is passed. +GUIX_BUILD_OPTIONS="--no-grafts" # Applying a manifest file. cat > "$module_dir/manifest.scm"<