summary refs log tree commit diff
path: root/tests/guix-package.sh
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2016-03-02 14:44:18 +0100
committerLudovic Courtès <ludo@gnu.org>2016-03-02 14:47:07 +0100
commit442a6ff5eae094f1fd4e09241a2f35c33ab908da (patch)
treed4b142a289b584d54ca5fd8841c2ecb9aa87994c /tests/guix-package.sh
parent637cd1254320fd89fe6d910b3fa7665b19487072 (diff)
downloadguix-442a6ff5eae094f1fd4e09241a2f35c33ab908da.tar.gz
tests: Disable grafts by default.
Fixes <http://bugs.gnu.org/22872>.
Reported by myglc2 <myglc2@gmail.com>.

* 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.
Diffstat (limited to 'tests/guix-package.sh')
-rw-r--r--tests/guix-package.sh6
1 files changed, 4 insertions, 2 deletions
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"<<EOF