Skip to content

Commit f191841

Browse files
committed
Test derivation options with content-addressing too
Now, both the unit and functional tests relating to derivation options are tested both ways -- with input addressing and content-addressing derivations. (cherry picked from commit 307dbe9)
1 parent 37bcd29 commit f191841

37 files changed

+560
-94
lines changed

src/libstore-tests/data/derivation/advanced-attributes-defaults.drv

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/libstore-tests/data/derivation/advanced-attributes-structured-attrs-defaults.drv

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/libstore-tests/data/derivation/advanced-attributes-structured-attrs.drv

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/libstore-tests/data/derivation/advanced-attributes.drv

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../../../tests/functional/derivation/ca/advanced-attributes-defaults.drv
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"args": [
3+
"-c",
4+
"echo hello > $out"
5+
],
6+
"builder": "/bin/bash",
7+
"env": {
8+
"builder": "/bin/bash",
9+
"name": "advanced-attributes-defaults",
10+
"out": "/1rz4g4znpzjwh1xymhjpm42vipw92pr73vdgl6xs1hycac8kf2n9",
11+
"outputHashAlgo": "sha256",
12+
"outputHashMode": "recursive",
13+
"system": "my-system"
14+
},
15+
"inputDrvs": {},
16+
"inputSrcs": [],
17+
"name": "advanced-attributes-defaults",
18+
"outputs": {
19+
"out": {
20+
"hashAlgo": "sha256",
21+
"method": "nar"
22+
}
23+
},
24+
"system": "my-system"
25+
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../../../tests/functional/derivation/ca/advanced-attributes-structured-attrs-defaults.drv
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"args": [
3+
"-c",
4+
"echo hello > $out"
5+
],
6+
"builder": "/bin/bash",
7+
"env": {
8+
"__json": "{\"builder\":\"/bin/bash\",\"name\":\"advanced-attributes-structured-attrs-defaults\",\"outputHashAlgo\":\"sha256\",\"outputHashMode\":\"recursive\",\"outputs\":[\"out\",\"dev\"],\"system\":\"my-system\"}",
9+
"dev": "/02qcpld1y6xhs5gz9bchpxaw0xdhmsp5dv88lh25r2ss44kh8dxz",
10+
"out": "/1rz4g4znpzjwh1xymhjpm42vipw92pr73vdgl6xs1hycac8kf2n9"
11+
},
12+
"inputDrvs": {},
13+
"inputSrcs": [],
14+
"name": "advanced-attributes-structured-attrs-defaults",
15+
"outputs": {
16+
"dev": {
17+
"hashAlgo": "sha256",
18+
"method": "nar"
19+
},
20+
"out": {
21+
"hashAlgo": "sha256",
22+
"method": "nar"
23+
}
24+
},
25+
"system": "my-system"
26+
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../../../tests/functional/derivation/ca/advanced-attributes-structured-attrs.drv
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
{
2+
"args": [
3+
"-c",
4+
"echo hello > $out"
5+
],
6+
"builder": "/bin/bash",
7+
"env": {
8+
"__json": "{\"__darwinAllowLocalNetworking\":true,\"__impureHostDeps\":[\"/usr/bin/ditto\"],\"__noChroot\":true,\"__sandboxProfile\":\"sandcastle\",\"allowSubstitutes\":false,\"builder\":\"/bin/bash\",\"impureEnvVars\":[\"UNICORN\"],\"name\":\"advanced-attributes-structured-attrs\",\"outputChecks\":{\"bin\":{\"disallowedReferences\":[\"/05pdic30acaypbz73ivw4wlsi9whq08jxsimml2h0inwqya2hn99\"],\"disallowedRequisites\":[\"/05pdic30acaypbz73ivw4wlsi9whq08jxsimml2h0inwqya2hn99\"]},\"dev\":{\"maxClosureSize\":5909,\"maxSize\":789},\"out\":{\"allowedReferences\":[\"/08cr1k2yfw44g21w1h850285vqhsciy7y3siqjdzz1m9yvwlqfm8\"],\"allowedRequisites\":[\"/08cr1k2yfw44g21w1h850285vqhsciy7y3siqjdzz1m9yvwlqfm8\"]}},\"outputHashAlgo\":\"sha256\",\"outputHashMode\":\"recursive\",\"outputs\":[\"out\",\"bin\",\"dev\"],\"preferLocalBuild\":true,\"requiredSystemFeatures\":[\"rainbow\",\"uid-range\"],\"system\":\"my-system\"}",
9+
"bin": "/04f3da1kmbr67m3gzxikmsl4vjz5zf777sv6m14ahv22r65aac9m",
10+
"dev": "/02qcpld1y6xhs5gz9bchpxaw0xdhmsp5dv88lh25r2ss44kh8dxz",
11+
"out": "/1rz4g4znpzjwh1xymhjpm42vipw92pr73vdgl6xs1hycac8kf2n9"
12+
},
13+
"inputDrvs": {
14+
"/nix/store/spfzlnkwb1v8s62yvh8vj1apd1kwjr5f-foo.drv": {
15+
"dynamicOutputs": {},
16+
"outputs": [
17+
"out"
18+
]
19+
},
20+
"/nix/store/x1vpzav565aqr7ccmkn0wv0svkm1qrbl-bar.drv": {
21+
"dynamicOutputs": {},
22+
"outputs": [
23+
"out"
24+
]
25+
}
26+
},
27+
"inputSrcs": [],
28+
"name": "advanced-attributes-structured-attrs",
29+
"outputs": {
30+
"bin": {
31+
"hashAlgo": "sha256",
32+
"method": "nar"
33+
},
34+
"dev": {
35+
"hashAlgo": "sha256",
36+
"method": "nar"
37+
},
38+
"out": {
39+
"hashAlgo": "sha256",
40+
"method": "nar"
41+
}
42+
},
43+
"system": "my-system"
44+
}

0 commit comments

Comments
 (0)