diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2019-05-07 21:15:45 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2019-06-15 16:36:33 +0200 |
| commit | 5064971ded3e2cc7c6b80d3166270a87a9650c09 (patch) | |
| tree | dcc28ef5e2f7ab7e1eccb3639f40bb3971d56897 /tests/nix-shell.sh | |
| parent | 34fa8ce9179b17cc4cd13ae49b69fccf393271a0 (diff) | |
Fix test failures when $TMPDIR changes
(cherry picked from commit c38c726eb5d447c7e9d894d57cd05ac46c173ddd)
Diffstat (limited to 'tests/nix-shell.sh')
| -rw-r--r-- | tests/nix-shell.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/nix-shell.sh b/tests/nix-shell.sh index 6024ea399..ee502dddb 100644 --- a/tests/nix-shell.sh +++ b/tests/nix-shell.sh @@ -27,13 +27,13 @@ output=$(nix-shell --pure --keep SELECTED_IMPURE_VAR shell.nix -A shellDrv --run # Test nix-shell on a .drv symlink # Legacy: absolute path and .drv extension required -nix-instantiate shell.nix -A shellDrv --indirect --add-root shell.drv -[[ $(nix-shell --pure $PWD/shell.drv --run \ +nix-instantiate shell.nix -A shellDrv --indirect --add-root $TEST_ROOT/shell.drv +[[ $(nix-shell --pure $TEST_ROOT/shell.drv --run \ 'echo "$IMPURE_VAR - $VAR_FROM_STDENV_SETUP - $VAR_FROM_NIX"') = " - foo - bar" ]] # New behaviour: just needs to resolve to a derivation in the store -nix-instantiate shell.nix -A shellDrv --indirect --add-root shell -[[ $(nix-shell --pure shell --run \ +nix-instantiate shell.nix -A shellDrv --indirect --add-root $TEST_ROOT/shell +[[ $(nix-shell --pure $TEST_ROOT/shell --run \ 'echo "$IMPURE_VAR - $VAR_FROM_STDENV_SETUP - $VAR_FROM_NIX"') = " - foo - bar" ]] # Test nix-shell -p |