diff options
| author | Théophane Hufschmitt <theophane@hufschmitt.net> | 2022-03-17 11:34:31 +0100 |
|---|---|---|
| committer | Théophane Hufschmitt <theophane@hufschmitt.net> | 2022-03-17 11:55:19 +0100 |
| commit | 3fc4c612fbde332d66b78dcc5b17b7d0d5235484 (patch) | |
| tree | b8de5af62186ad944edd91a183354b0984f84087 /tests | |
| parent | fe1ad9613561ea78b6d97cf82c03d2dd77e43f69 (diff) | |
Fix `nix build --dry-run` with CA derivations
Don’t try and assume that we know the output paths when we’ve just built
with `--dry-run`. Instead make `--dry-run` follow a different code path
that won’t assume the knowledge of the output paths at all.
Fix #6275
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 + |