diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-11-13 09:58:47 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-11-13 10:10:13 +0100 |
| commit | ff23b47dbee038236386ddc2ed2fff4c77ad3aa1 (patch) | |
| tree | d2dcec3dc3fc66f3e0c6276e8586f10ef208eb69 | |
| parent | 6b7490b3404bcb3f04689e0eb61ef3b5e65aedde (diff) | |
| download | patches-ff23b47dbee038236386ddc2ed2fff4c77ad3aa1.tar patches-ff23b47dbee038236386ddc2ed2fff4c77ad3aa1.tar.gz | |
tests: 'guix-gc.sh' passes even when 'out' or 'drv' are defined as env vars.
This fixes a test failure exhibited by
fb17a89912c2a3738dae716e30481c11e1c6f0ac whereby assignments to 'out' in
guix-gc.sh would go to the 'out' environment variable, when it exists,
which in turn prevents garbage collection of $out.
* tests/guix-gc.sh: Add 'unset' invocations.
| -rw-r--r-- | tests/guix-gc.sh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/tests/guix-gc.sh b/tests/guix-gc.sh index a100f186f5..57c5e7dd61 100644 --- a/tests/guix-gc.sh +++ b/tests/guix-gc.sh @@ -1,5 +1,5 @@ # GNU Guix --- Functional package management for GNU -# Copyright © 2013, 2015 Ludovic Courtès <ludo@gnu.org> +# Copyright © 2013, 2015, 2017 Ludovic Courtès <ludo@gnu.org> # # This file is part of GNU Guix. # @@ -25,6 +25,14 @@ guix gc --version trap "rm -f guix-gc-root" EXIT rm -f guix-gc-root +# Below we are using 'drv' and 'out' to contain store file names. If 'drv' +# and 'out' are environment variables, 'list-runtime-roots' will "see" them +# and thus prevent $drv and $out from being garbage-collected. Using 'unset' +# allows us to make sure these are truly local shell variables and not +# environments variables. +unset drv +unset out + # For some operations, passing extra arguments is an error. for option in "" "-C 500M" "--verify" "--optimize" do |