diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-03-31 00:05:02 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-03-31 00:06:36 +0200 |
| commit | b771e0176a9cafaaf5fc279a7f3e5e3033b5fb4f (patch) | |
| tree | 2a3f7438afbf8b3d2b42a792a19415d24bf527f5 | |
| parent | a357849f5b1314c2a35efeee237645b9b08c39f5 (diff) | |
| download | patches-b771e0176a9cafaaf5fc279a7f3e5e3033b5fb4f.tar patches-b771e0176a9cafaaf5fc279a7f3e5e3033b5fb4f.tar.gz | |
pack: Adjust test to '--dry-run' changes.
This is a followup to 131f50cdc9dbb7183023f4dae759876a9e700bef.
* tests/guix-pack.sh: Use '--no-grafts' in conjunction with '-n' and '-d'.
| -rw-r--r-- | tests/guix-pack.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/guix-pack.sh b/tests/guix-pack.sh index 7a0f3400c3..14e3cda361 100644 --- a/tests/guix-pack.sh +++ b/tests/guix-pack.sh @@ -1,6 +1,6 @@ # GNU Guix --- Functional package management for GNU # Copyright © 2018 Chris Marusich <cmmarusich@gmail.com> -# Copyright © 2018, 2019 Ludovic Courtès <ludo@gnu.org> +# Copyright © 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> # # This file is part of GNU Guix. # @@ -105,8 +105,8 @@ guix pack -R --dry-run --bootstrap -S /mybin=bin guile-bootstrap # Make sure package transformation options are honored. mkdir -p "$test_directory" -drv1="`guix pack -n guile 2>&1 | grep pack.*\.drv`" -drv2="`guix pack -n --with-source=guile=$test_directory guile 2>&1 | grep pack.*\.drv`" +drv1="`guix pack --no-grafts -n guile 2>&1 | grep pack.*\.drv`" +drv2="`guix pack --no-grafts -n --with-source=guile=$test_directory guile 2>&1 | grep pack.*\.drv`" test -n "$drv1" test "$drv1" != "$drv2" @@ -117,6 +117,6 @@ EOF cat > "$test_directory/manifest2.scm" <<EOF (specifications->manifest '("emacs")) EOF -drv="`guix pack -nd -m "$test_directory/manifest1.scm" -m "$test_directory/manifest2.scm"`" -guix gc -R "$drv" | grep `guix build guile -nd` -guix gc -R "$drv" | grep `guix build emacs -nd` +drv="`guix pack --no-grafts -d -m "$test_directory/manifest1.scm" -m "$test_directory/manifest2.scm"`" +guix gc -R "$drv" | grep `guix build guile -d --no-grafts` +guix gc -R "$drv" | grep `guix build emacs -d --no-grafts` |