Skip to content

Commit 37bcd29

Browse files
committed
Use the same variable for content addressing in functional tests
`CONTENT_ADDRESSED` -> `NIX_TESTS_CA_BY_DEFAULT` (cherry picked from commit 7acc229)
1 parent 5ecbf6b commit 37bcd29

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

tests/functional/build-remote-content-addressed-floating.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ file=build-hook-ca-floating.nix
66

77
enableFeatures "ca-derivations"
88

9-
CONTENT_ADDRESSED=true
9+
NIX_TESTS_CA_BY_DEFAULT=true
1010

1111
source build-remote.sh

tests/functional/build-remote.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ unset NIX_STATE_DIR
1313
function join_by { local d=$1; shift; echo -n "$1"; shift; printf "%s" "${@/#/$d}"; }
1414

1515
EXTRA_SYSTEM_FEATURES=()
16-
if [[ -n "${CONTENT_ADDRESSED-}" ]]; then
16+
if [[ -n "${NIX_TESTS_CA_BY_DEFAULT-}" ]]; then
1717
EXTRA_SYSTEM_FEATURES=("ca-derivations")
1818
fi
1919

tests/functional/ca/nix-shell.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
source common.sh
44

5-
CONTENT_ADDRESSED=true
5+
NIX_TESTS_CA_BY_DEFAULT=true
66
cd ..
77
source ./nix-shell.sh

tests/functional/nix-shell.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ source common.sh
44

55
clearStoreIfPossible
66

7-
if [[ -n ${CONTENT_ADDRESSED:-} ]]; then
7+
if [[ -n ${NIX_TESTS_CA_BY_DEFAULT:-} ]]; then
88
shellDotNix="$PWD/ca-shell.nix"
99
else
1010
shellDotNix="$PWD/shell.nix"

0 commit comments

Comments
 (0)