diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2019-05-07 21:15:45 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2019-05-07 22:49:13 +0200 |
| commit | c38c726eb5d447c7e9d894d57cd05ac46c173ddd (patch) | |
| tree | 3455aaaa4af1c2ad23b303c9f550e0a9d18b71bf /tests/nix-shell.sh | |
| parent | b9c016abc1a533f972248e8d0739e55e623a4dcb (diff) | |
Fix test failures when $TMPDIR changes
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 |