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

Merge remote-tracking branch 'obsidian/single-ca-drv-build' into ca-floating-upstream

Browse source 
Tests also now fail as they should
This commit is contained in:
John Ericson 2020-09-03 22:44:56 +00:00
parent 975a47f7fe 145915eb39
commit b836662f50
2 changed files with 32 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
tests/content-addressed.nix
View file

@ -5,12 +5,11 @@ with import ./config.nix;
# The derivation can be arbitrarily modified by passing a different `seed`,
# but the output will always be the same
rec {
root = mkDerivation {
name = "simple-content-addressed";
rootLegacy = mkDerivation {
name = "simple-input-addressed";
buildCommand = ''
set -x
echo "Building a CA derivation"
echo "The seed is ${toString seed}"
echo "Building a legacy derivation"
mkdir -p $out
echo "Hello World" > $out/hello
'';
@ -18,23 +17,35 @@ rec {
outputHashMode = "recursive";
outputHashAlgo = "sha256";
};
dependent = mkDerivation {
rootCA = mkDerivation {
name = "dependent";
buildCommand = ''
echo "building a dependent derivation"
echo "building a CA derivation"
echo "The seed is ${toString seed}"
mkdir -p $out
echo ${root}/hello > $out/dep
echo ${rootLegacy}/hello > $out/dep
'';
__contentAddressed = true;
outputHashMode = "recursive";
outputHashAlgo = "sha256";
};
transitivelyDependent = mkDerivation {
dependentCA = mkDerivation {
name = "dependent";
buildCommand = ''
echo "building a dependent derivation"
mkdir -p $out
echo ${rootCA}/hello > $out/dep
'';
__contentAddressed = true;
outputHashMode = "recursive";
outputHashAlgo = "sha256";
};
transitivelyDependentCA = mkDerivation {
name = "transitively-dependent";
buildCommand = ''
echo "building transitively-dependent"
cat ${dependent}/dep
echo ${dependent} > $out
cat ${dependentCA}/dep
echo ${dependentCA} > $out
'';
__contentAddressed = true;
outputHashMode = "recursive";

19
tests/content-addressed.sh
View file

@ -2,20 +2,23 @@
source common.sh
drv=$(nix-instantiate --experimental-features ca-derivations ./content-addressed.nix -A root --arg seed 1)
drv=$(nix-instantiate --experimental-features ca-derivations ./content-addressed.nix -A rootCA --arg seed 1)
nix --experimental-features 'nix-command ca-derivations' show-derivation --derivation "$drv" --arg seed 1
testDerivation () {
local derivationPath=$1
local commonArgs=("--experimental-features" "ca-derivations" "./content-addressed.nix" "-A" "$derivationPath" "--no-out-link")
local out1=$(nix-build "${commonArgs[@]}" --arg seed 1)
local out2=$(nix-build "${commonArgs[@]}" --arg seed 2 "${extraArgs[@]}")
test $out1 == $out2
local out1 out2
out1=$(set -e; nix-build "${commonArgs[@]}" --arg seed 1)
out2=$(nix-build "${commonArgs[@]}" --arg seed 2 "${secondSeedArgs[@]}")
test "$out1" == "$out2"
}
testDerivation root
testDerivation rootCA
# The seed only changes the root derivation, and not it's output, so the
# dependent derivations should only need to be built once.
extaArgs=(-j0)
testDerivation dependent
testDerivation transitivelyDependent
secondSeedArgs=(-j0)
# Don't directly build depenentCA, that way we'll make sure we dodn't rely on
# dependent derivations always being already built.
#testDerivation dependentCA
testDerivation transitivelyDependentCA