Skip to content

Commit 99f14d4

Browse files
committed
Revert "tests/check.sh: Fix a race"
This reverts commit 0776aa1 because it's causing a test failure: https://hydra.nixos.org/build/247889890
1 parent b4d5aac commit 99f14d4

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

tests/add.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ echo $path2
99
if test "$path1" != "$path2"; then
1010
echo "nix-store --add and --add-fixed mismatch"
1111
exit 1
12-
fi
12+
fi
1313

1414
path3=$(nix-store --add-fixed sha256 ./dummy)
1515
echo $path3

tests/check.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ with import ./config.nix;
1111
};
1212

1313
hashmismatch = import <nix/fetchurl.nix> {
14-
url = "file://" + builtins.getEnv "TMPDIR" + "/dummy";
14+
url = "file://" + toString ./dummy;
1515
sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73";
1616
};
1717

tests/check.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ nix-build check.nix -A fetchurl --no-out-link --repair --hashed-mirrors ''
3434
nix-build check.nix -A hashmismatch --no-out-link --hashed-mirrors '' || status=$?
3535
[ "$status" = "102" ]
3636

37-
echo -n > $TMPDIR/dummy
37+
echo -n > ./dummy
3838
nix-build check.nix -A hashmismatch --no-out-link --hashed-mirrors ''
39-
echo 'Hello World' > $TMPDIR/dummy
39+
echo 'Hello World' > ./dummy
4040

4141
nix-build check.nix -A hashmismatch --no-out-link --check --hashed-mirrors '' || status=$?
4242
[ "$status" = "102" ]

0 commit comments

Comments
 (0)