summaryrefslogtreecommitdiff
path: root/lib/fileset/tests.sh
diff options
context:
space:
mode:
authorSilvan Mosberger <silvan.mosberger@tweag.io>2023-09-20 21:08:13 +0200
committerSilvan Mosberger <silvan.mosberger@tweag.io>2023-10-03 21:27:40 +0200
commitb3c2281219893ee422e18f9d3917e8cc8216114d (patch)
treefdee05538db03c9ccbff93a53686424c9e68120f /lib/fileset/tests.sh
parentMerge pull request #258119 from mweinelt/clevercsv-0.8.2 (diff)
downloadnixpkgs-b3c2281219893ee422e18f9d3917e8cc8216114d.tar.gz
lib.fileset: Order noEval last
Diffstat (limited to 'lib/fileset/tests.sh')
-rwxr-xr-xlib/fileset/tests.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/fileset/tests.sh b/lib/fileset/tests.sh
index 525b8aaa9170..1b53e33073ef 100755
--- a/lib/fileset/tests.sh
+++ b/lib/fileset/tests.sh
@@ -84,14 +84,14 @@ expectStorePath() {
crudeUnquoteJSON <<< "$result"
}
-# Check that a nix expression fails to evaluate (strictly, coercing to json, read-write-mode).
+# Check that a nix expression fails to evaluate (strictly, read-write-mode).
# And check the received stderr against a regex
# The expression has `lib.fileset` in scope.
# Usage: expectFailure NIX REGEX
expectFailure() {
local expr=$1
local expectedErrorRegex=$2
- if result=$(nix-instantiate --eval --strict --json --read-write-mode --show-trace 2>"$tmp/stderr" \
+ if result=$(nix-instantiate --eval --strict --read-write-mode --show-trace 2>"$tmp/stderr" \
--expr "$prefixExpression $expr"); then
die "$expr evaluated successfully to $result, but it was expected to fail"
fi