From 3f80060500bb3a9dff192c11af63da7364673ab0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 21 Aug 2014 21:50:19 +0200 Subject: Fix tests So all these years I was totally deluded about the meaning of "set -e". You might think that it causes statements like "false && true" or "! true" to fail, but it doesn't... --- tests/check-refs.sh | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'tests/check-refs.sh') diff --git a/tests/check-refs.sh b/tests/check-refs.sh index 08fe01ec1..9e103664a 100644 --- a/tests/check-refs.sh +++ b/tests/check-refs.sh @@ -1,24 +1,22 @@ source common.sh -set -x - RESULT=$TEST_ROOT/result dep=$(nix-build -o $RESULT check-refs.nix -A dep) # test1 references dep, not itself. test1=$(nix-build -o $RESULT check-refs.nix -A test1) -! nix-store -q --references $test1 | grep -q $test1 +(! nix-store -q --references $test1 | grep -q $test1) nix-store -q --references $test1 | grep -q $dep # test2 references src, not itself nor dep. test2=$(nix-build -o $RESULT check-refs.nix -A test2) -! nix-store -q --references $test2 | grep -q $test2 -! nix-store -q --references $test2 | grep -q $dep +(! nix-store -q --references $test2 | grep -q $test2) +(! nix-store -q --references $test2 | grep -q $dep) nix-store -q --references $test2 | grep -q aux-ref # test3 should fail (unallowed ref). -! nix-build -o $RESULT check-refs.nix -A test3 +(! nix-build -o $RESULT check-refs.nix -A test3) # test4 should succeed. nix-build -o $RESULT check-refs.nix -A test4 @@ -27,10 +25,10 @@ nix-build -o $RESULT check-refs.nix -A test4 nix-build -o $RESULT check-refs.nix -A test5 # test6 should fail (unallowed self-ref). -! nix-build -o $RESULT check-refs.nix -A test6 +(! nix-build -o $RESULT check-refs.nix -A test6) # test7 should succeed (allowed self-ref). nix-build -o $RESULT check-refs.nix -A test7 # test8 should fail (toFile depending on derivation output). -! nix-build -o $RESULT check-refs.nix -A test8 +(! nix-build -o $RESULT check-refs.nix -A test8) -- cgit v1.2.3