diff options
| author | Théophane Hufschmitt <7226587+thufschmitt@users.noreply.github.com> | 2022-12-07 21:43:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-07 21:43:09 +0100 |
| commit | f4d6f3ae8fcd10835c3e50339e9caf4b28a98ee5 (patch) | |
| tree | 2b31af90bf7e174de384598d1dd55033738035db | |
| parent | 5dce1a5af6ffd911657ee1be2403a4f694c67477 (diff) | |
| parent | 08dcd22582d65e73f29df79b3765e76cea8f3314 (diff) | |
Merge pull request #7404 from ncfavier/tmpdir-tests
tests: don't refer to TMPDIR
| -rw-r--r-- | tests/check.nix | 2 | ||||
| -rw-r--r-- | tests/check.sh | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/check.nix b/tests/check.nix index ed91ff845..ddab8eea9 100644 --- a/tests/check.nix +++ b/tests/check.nix @@ -44,7 +44,7 @@ with import ./config.nix; }; hashmismatch = import <nix/fetchurl.nix> { - url = "file://" + builtins.getEnv "TMPDIR" + "/dummy"; + url = "file://" + builtins.getEnv "TEST_ROOT" + "/dummy"; sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73"; }; diff --git a/tests/check.sh b/tests/check.sh index 495202781..fbd784fc5 100644 --- a/tests/check.sh +++ b/tests/check.sh @@ -91,13 +91,13 @@ nix-build check.nix -A fetchurl --no-out-link --check nix-build check.nix -A fetchurl --no-out-link --repair [[ $(cat $path) != foo ]] -echo 'Hello World' > $TMPDIR/dummy +echo 'Hello World' > $TEST_ROOT/dummy nix-build check.nix -A hashmismatch --no-out-link || status=$? [ "$status" = "102" ] -echo -n > $TMPDIR/dummy +echo -n > $TEST_ROOT/dummy nix-build check.nix -A hashmismatch --no-out-link -echo 'Hello World' > $TMPDIR/dummy +echo 'Hello World' > $TEST_ROOT/dummy nix-build check.nix -A hashmismatch --no-out-link --check || status=$? [ "$status" = "102" ] |