diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2023-07-12 23:33:43 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2023-07-13 07:56:33 -0400 |
commit | caabc4f64889d5a4c47d6102b3aa1d3c80bbc107 (patch) | |
tree | 6859d20eec12b628ca77c07dee7e41e2e6a91f00 /src/libexpr/tests | |
parent | cafb5e8a1751b2c951347d5d9188b2e0bee357be (diff) |
Feature gate `DownstreamPlaceholder::unknownCaOutput`
This is a part of CA derivations that we forgot to put behind the
experimental feature.
This was caught by @fricklerhandwerk in
https://github.com/NixOS/nix/pull/8369#discussion_r1258133719
Diffstat (limited to 'src/libexpr/tests')
-rw-r--r-- | src/libexpr/tests/derived-path.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/libexpr/tests/derived-path.cc b/src/libexpr/tests/derived-path.cc index 8210efef2..c713fe28a 100644 --- a/src/libexpr/tests/derived-path.cc +++ b/src/libexpr/tests/derived-path.cc @@ -37,8 +37,15 @@ RC_GTEST_FIXTURE_PROP( prop_built_path_placeholder_round_trip, (const StorePath & drvPath, const StorePathName & outputName)) { + /** + * We set these in tests rather than the regular globals so we don't have + * to worry about race conditions if the tests run concurrently. + */ + ExperimentalFeatureSettings mockXpSettings; + mockXpSettings.set("experimental-features", "ca-derivations"); + auto * v = state.allocValue(); - state.mkOutputString(*v, drvPath, outputName.name, std::nullopt); + state.mkOutputString(*v, drvPath, outputName.name, std::nullopt, mockXpSettings); auto [d, _] = state.coerceToDerivedPathUnchecked(noPos, *v, ""); DerivedPath::Built b { .drvPath = drvPath, |