lix-project/lix
20
57
Fork 31
Code Issues 350 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Merge pull request #4308 from tweag/properly-test-early-cutoff

Browse source 
Properly test the early cutoff for CA derivations
This commit is contained in:
Eelco Dolstra 2020-12-03 14:45:29 +01:00 committed by GitHub
parent 4f25644a13 8ad72b1f1c
commit 0bd060f23a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/libstore/build/worker.cc
View file

@ -223,11 +223,6 @@ void Worker::run(const Goals & _topGoals)
uint64_t downloadSize, narSize; uint64_t downloadSize, narSize;
store.queryMissing(topPaths, willBuild, willSubstitute, unknown, downloadSize, narSize); store.queryMissing(topPaths, willBuild, willSubstitute, unknown, downloadSize, narSize);
if (!willBuild.empty() && 0 == settings.maxBuildJobs && getMachines().empty())
throw Error(
"%d derivations need to be built, but neither local builds ('--max-jobs') "
"nor remote builds ('--builders') are enabled", willBuild.size());
debug("entered goal loop"); debug("entered goal loop");
while (1) { while (1) {

16
tests/content-addressed.sh
View file

@ -7,30 +7,32 @@ nix --experimental-features 'nix-command ca-derivations' show-derivation --deriv
buildAttr () { buildAttr () {
local derivationPath=$1 local derivationPath=$1
shift local seedValue=$2
local args=("--experimental-features" "ca-derivations" "./content-addressed.nix" "-A" "$derivationPath" "--no-out-link") shift; shift
local args=("--experimental-features" "ca-derivations" "./content-addressed.nix" "-A" "$derivationPath" --arg seed "$seedValue" "--no-out-link")
args+=("$@") args+=("$@")
nix-build "${args[@]}" nix-build "${args[@]}"
} }
testRemoteCache () { testRemoteCache () {
clearCache clearCache
local outPath=$(buildAttr dependentNonCA) local outPath=$(buildAttr dependentNonCA 1)
nix copy --to file://$cacheDir $outPath nix copy --to file://$cacheDir $outPath
clearStore clearStore
buildAttr dependentNonCA --option substituters file://$cacheDir --no-require-sigs |& (! grep "building dependent-non-ca") buildAttr dependentNonCA 1 --option substituters file://$cacheDir --no-require-sigs |& (! grep "building dependent-non-ca")
} }
testDeterministicCA () { testDeterministicCA () {
[[ $(buildAttr rootCA) = $(buildAttr rootCA) ]] [[ $(buildAttr rootCA 1) = $(buildAttr rootCA 2) ]]
} }
testCutoffFor () { testCutoffFor () {
local out1 out2 local out1 out2
out1=$(buildAttr $1) out1=$(buildAttr $1 1)
# The seed only changes the root derivation, and not it's output, so the # The seed only changes the root derivation, and not it's output, so the
# dependent derivations should only need to be built once. # dependent derivations should only need to be built once.
out2=$(buildAttr $1 -j0) buildAttr rootCA 2
out2=$(buildAttr $1 2 -j0)
test "$out1" == "$out2" test "$out1" == "$out2"
} }