diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2022-03-17 22:23:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-17 22:23:15 +0100 |
| commit | 6afc3617982e872fac2142c3aeccd1e8482e7e52 (patch) | |
| tree | 13d48a1a8b1047c11f8961b2a034e29c3a652231 /tests | |
| parent | d8f69b9a4c3600d0ddfcbc17659b71c53f14f5f0 (diff) | |
| parent | 3fc4c612fbde332d66b78dcc5b17b7d0d5235484 (diff) | |
Merge pull request #6277 from thufschmitt/ca/nix-build-dry-run
Fix `nix build --dry-run` with CA derivations
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/build-dry.sh | 19 | ||||
| -rw-r--r-- | tests/ca/build-dry.sh | 6 |
2 files changed, 25 insertions, 0 deletions
diff --git a/tests/build-dry.sh b/tests/build-dry.sh index e72533e70..f0f38e9a0 100644 --- a/tests/build-dry.sh +++ b/tests/build-dry.sh @@ -50,3 +50,22 @@ nix build -f dependencies.nix -o $RESULT --dry-run nix build -f dependencies.nix -o $RESULT [[ -h $RESULT ]] + +################################################### +# Check the JSON output +clearStore +clearCache + +RES=$(nix build -f dependencies.nix --dry-run --json) + +if [[ -z "$NIX_TESTS_CA_BY_DEFAULT" ]]; then + echo "$RES" | jq '.[0] | [ + (.drvPath | test("'$NIX_STORE_DIR'.*\\.drv")), + (.outputs.out | test("'$NIX_STORE_DIR'")) + ] | all' +else + echo "$RES" | jq '.[0] | [ + (.drvPath | test("'$NIX_STORE_DIR'.*\\.drv")), + .outputs.out == null + ] | all' +fi diff --git a/tests/ca/build-dry.sh b/tests/ca/build-dry.sh new file mode 100644 index 000000000..9a72075ec --- /dev/null +++ b/tests/ca/build-dry.sh @@ -0,0 +1,6 @@ +source common.sh + +export NIX_TESTS_CA_BY_DEFAULT=1 + +cd .. && source build-dry.sh + |