From e8bd1bc732ff19f33e6915d14e15df1d7de612c0 Mon Sep 17 00:00:00 2001
From: Bruce Toll <4109762+tollb@users.noreply.github.com>
Date: Fri, 10 Apr 2020 18:20:12 -0400
Subject: [PATCH] Add test case for temporary directories on darwin
A test case for correct handling of temporary directory deletion that
was added to check.sh as part of PR #2689 was initially disabled for
Darwin because of a directory permission issue in PR #2688.
Now that the issue in PR #2688 is fixed, this commit enables the test
case for Darwin.
---
tests/check.sh | 5 -----
1 file changed, 5 deletions(-)
diff --git a/tests/check.sh b/tests/check.sh
index b423dc0b5..5f25d04cb 100644
--- a/tests/check.sh
+++ b/tests/check.sh
@@ -49,13 +49,8 @@ checkBuildTempDirRemoved $TEST_ROOT/log
nix-build check.nix -A nondeterministic --argstr checkBuildId $checkBuildId \
--no-out-link --check --keep-failed 2> $TEST_ROOT/log || status=$?
-
-# The above nix-build fails with status=1 on darwin (not sure why)
-# ...but the primary purpose of the test case is to verify the temp directory is retained
-if [ "$(uname -s)" != "Darwin" ]; then
grep 'may not be deterministic' $TEST_ROOT/log
[ "$status" = "104" ]
-fi
if checkBuildTempDirRemoved $TEST_ROOT/log; then false; fi
clearStore
--
GitLab