diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2018-10-27T13·40+0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2018-10-27T13·41+0200 |
| commit | 18b4c53f71dfc626f5f5ffa0282afd1b9faad6a4 (patch) | |
| tree | 011f81c17e77bd269f36a0b0f7f74342c1fa3b9e /tests | |
| parent | 1427958b3cf4a8d5c7e46169c00039f6b75317d2 (diff) | |
Restore old (dis)allowedRequisites behaviour for self-references
stdenv relies on this. So ignore self-references (but only in legacy non-structured attributes mode).
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/check-refs.sh | 2 | ||||
| -rw-r--r-- | tests/check-reqs.nix | 2 | ||||
| -rw-r--r-- | tests/check-reqs.sh | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/tests/check-refs.sh b/tests/check-refs.sh index 34ee22cfc8f7..16bbabc40985 100644 --- a/tests/check-refs.sh +++ b/tests/check-refs.sh @@ -1,5 +1,7 @@ source common.sh +clearStore + RESULT=$TEST_ROOT/result dep=$(nix-build -o $RESULT check-refs.nix -A dep) diff --git a/tests/check-reqs.nix b/tests/check-reqs.nix index 47b5b3d9c723..41436cb48e08 100644 --- a/tests/check-reqs.nix +++ b/tests/check-reqs.nix @@ -33,7 +33,7 @@ rec { }; # When specifying all the requisites, the build succeeds. - test1 = makeTest 1 [ "out" dep1 dep2 deps ]; + test1 = makeTest 1 [ dep1 dep2 deps ]; # But missing anything it fails. test2 = makeTest 2 [ dep2 deps ]; diff --git a/tests/check-reqs.sh b/tests/check-reqs.sh index 77689215def1..e9f65fc2a6d3 100644 --- a/tests/check-reqs.sh +++ b/tests/check-reqs.sh @@ -1,5 +1,7 @@ source common.sh +clearStore + RESULT=$TEST_ROOT/result nix-build -o $RESULT check-reqs.nix -A test1 |