diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-03-02 14:44:18 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-03-02 14:47:07 +0100 |
| commit | 442a6ff5eae094f1fd4e09241a2f35c33ab908da (patch) | |
| tree | d4b142a289b584d54ca5fd8841c2ecb9aa87994c /tests/guix-package.sh | |
| parent | 637cd1254320fd89fe6d910b3fa7665b19487072 (diff) | |
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.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/guix-package.sh b/tests/guix-package.sh index cf1a185590c..d75008448b2 100644 --- a/tests/guix-package.sh +++ b/tests/guix-package.sh | |||
| @@ -261,7 +261,7 @@ unset GUIX_PACKAGE_PATH | |||
| 261 | 261 | ||
| 262 | # Using 'GUIX_BUILD_OPTIONS'. | 262 | # Using 'GUIX_BUILD_OPTIONS'. |
| 263 | available="`guix package -A | sort`" | 263 | available="`guix package -A | sort`" |
| 264 | GUIX_BUILD_OPTIONS="--dry-run" | 264 | GUIX_BUILD_OPTIONS="--dry-run --no-grafts" |
| 265 | export GUIX_BUILD_OPTIONS | 265 | export GUIX_BUILD_OPTIONS |
| 266 | 266 | ||
| 267 | # Make sure $GUIX_BUILD_OPTIONS is not simply appended to the command-line, | 267 | # Make sure $GUIX_BUILD_OPTIONS is not simply appended to the command-line, |
| @@ -270,7 +270,9 @@ available2="`guix package -A | sort`" | |||
| 270 | test "$available2" = "$available" | 270 | test "$available2" = "$available" |
| 271 | guix package -I | 271 | guix package -I |
| 272 | 272 | ||
| 273 | unset GUIX_BUILD_OPTIONS | 273 | # Restore '--no-grafts', which makes sure we don't end up building stuff when |
| 274 | # '--dry-run' is passed. | ||
| 275 | GUIX_BUILD_OPTIONS="--no-grafts" | ||
| 274 | 276 | ||
| 275 | # Applying a manifest file. | 277 | # Applying a manifest file. |
| 276 | cat > "$module_dir/manifest.scm"<<EOF | 278 | cat > "$module_dir/manifest.scm"<<EOF |
