mirror of
https://github.com/privatevoid-net/nix-super.git
synced 2024-11-22 05:56:15 +02:00
Fix language tests a bit
- Remove some stray saved error messages that didn't correspond to any
test, because they were renamed in
d11faa01b5
.
- Need `--eval` in test failure test in order to get in "read-only" mode
where we don't try to write to the store. (The other tests already do
this.)
- Need `--strict` so top-level attribute sets are still forced, like
they are without `--eval`.
This commit is contained in:
parent
5442d9b472
commit
f7a36f9812
9 changed files with 14 additions and 27 deletions
|
@ -68,7 +68,7 @@ for i in lang/eval-fail-*.nix; do
|
|||
echo "evaluating $i (should fail)";
|
||||
i=$(basename "$i" .nix)
|
||||
if
|
||||
expectStderr 1 nix-instantiate --show-trace "lang/$i.nix" \
|
||||
expectStderr 1 nix-instantiate --eval --strict --show-trace "lang/$i.nix" \
|
||||
| sed "s!$(pwd)!/pwd!g" > "lang/$i.err"
|
||||
then
|
||||
diffAndAccept "$i" err err.exp
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
error: getting attributes of path ‘PWD/lang/fnord’: No such file or directory
|
|
@ -1,10 +0,0 @@
|
|||
error:
|
||||
… while evaluating a path segment
|
||||
|
||||
at /pwd/lang/eval-fail-bad-antiquote-1.nix:1:2:
|
||||
|
||||
1| "${x: x}"
|
||||
| ^
|
||||
2|
|
||||
|
||||
error: cannot coerce a function to a string
|
|
@ -1 +0,0 @@
|
|||
error: operation 'addToStoreFromDump' is not supported by store 'dummy'
|
|
@ -1,10 +0,0 @@
|
|||
error:
|
||||
… while evaluating a path segment
|
||||
|
||||
at /pwd/lang/eval-fail-bad-antiquote-3.nix:1:3:
|
||||
|
||||
1| ''${x: x}''
|
||||
| ^
|
||||
2|
|
||||
|
||||
error: cannot coerce a function to a string
|
|
@ -1 +1 @@
|
|||
error: operation 'addToStoreFromDump' is not supported by store 'dummy'
|
||||
error: getting status of '/pwd/lang/fnord': No such file or directory
|
||||
|
|
|
@ -1,4 +1,14 @@
|
|||
error: dynamic attribute 'b' already defined at /pwd/lang/eval-fail-dup-dynamic-attrs.nix:2:11
|
||||
error:
|
||||
… while evaluating the attribute 'set'
|
||||
|
||||
at /pwd/lang/eval-fail-dup-dynamic-attrs.nix:2:3:
|
||||
|
||||
1| {
|
||||
2| set = { "${"" + "b"}" = 1; };
|
||||
| ^
|
||||
3| set = { "${"b" + ""}" = 2; };
|
||||
|
||||
error: dynamic attribute 'b' already defined at /pwd/lang/eval-fail-dup-dynamic-attrs.nix:2:11
|
||||
|
||||
at /pwd/lang/eval-fail-dup-dynamic-attrs.nix:3:11:
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
error: operation 'addToStoreFromDump' is not supported by store 'dummy'
|
||||
error: getting status of '/pwd/lang/fnord': No such file or directory
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
error: attribute ‘services.ssh’ at (string):3:3 already defined at (string):2:3
|
Loading…
Reference in a new issue