From d4c3b6327ff88273462cec57b0e2805d333c386e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 11 Sep 2012 19:14:15 -0400 Subject: Don't put results symlinks in the tests directory --- tests/negative-caching.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/negative-caching.sh') diff --git a/tests/negative-caching.sh b/tests/negative-caching.sh index 7cbab00e4..4217bc38e 100644 --- a/tests/negative-caching.sh +++ b/tests/negative-caching.sh @@ -7,16 +7,16 @@ set +e opts="--option build-cache-failure true --print-build-trace" # This build should fail, and the failure should be cached. -log=$(nix-build $opts negative-caching.nix -A fail 2>&1) && fail "should fail" +log=$(nix-build $opts negative-caching.nix -A fail --no-out-link 2>&1) && fail "should fail" echo "$log" | grep -q "@ build-failed" || fail "no build-failed trace" # Do it again. The build shouldn't be tried again. -log=$(nix-build $opts negative-caching.nix -A fail 2>&1) && fail "should fail" +log=$(nix-build $opts negative-caching.nix -A fail --no-out-link 2>&1) && fail "should fail" echo "$log" | grep -q "FAIL" && fail "failed build not cached" echo "$log" | grep -q "@ build-failed .* cached" || fail "trace doesn't say cached" # Check that --keep-going works properly with cached failures. -log=$(nix-build $opts --keep-going negative-caching.nix -A depOnFail 2>&1) && fail "should fail" +log=$(nix-build $opts --keep-going negative-caching.nix -A depOnFail --no-out-link 2>&1) && fail "should fail" echo "$log" | grep -q "FAIL" && fail "failed build not cached (2)" echo "$log" | grep -q "@ build-failed .* cached" || fail "trace doesn't say cached (2)" echo "$log" | grep -q "@ build-succeeded .*-succeed" || fail "didn't keep going" -- cgit v1.2.3