diff options
Diffstat (limited to 'tests/functional')
| -rw-r--r-- | tests/functional/build.sh | 4 | ||||
| -rwxr-xr-x | tests/functional/lang.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/functional/build.sh b/tests/functional/build.sh index a14f6e3c2..58fba83aa 100644 --- a/tests/functional/build.sh +++ b/tests/functional/build.sh @@ -144,8 +144,8 @@ test "$(<<<"$out" grep -E '^error:' | wc -l)" = 1 # --keep-going and FOD out="$(nix build -f fod-failing.nix -L 2>&1)" && status=0 || status=$? test "$status" = 1 -# one "hash mismatch" error, one "build of ... failed" -test "$(<<<"$out" grep -E '^error:' | wc -l)" = 2 +# at least one "hash mismatch" error, one "build of ... failed" +test "$(<<<"$out" grep -E '^error:' | wc -l)" -ge 2 <<<"$out" grepQuiet -E "hash mismatch in fixed-output derivation '.*-x.\\.drv'" <<<"$out" grepQuiet -E "likely URL: " <<<"$out" grepQuiet -E "error: build of '.*-x[1-4]\\.drv\\^out', '.*-x[1-4]\\.drv\\^out', '.*-x[1-4]\\.drv\\^out', '.*-x[1-4]\\.drv\\^out' failed" diff --git a/tests/functional/lang.sh b/tests/functional/lang.sh index 59db10340..ca54fb88d 100755 --- a/tests/functional/lang.sh +++ b/tests/functional/lang.sh @@ -155,7 +155,7 @@ else echo '' echo 'You can rerun this test with:' echo '' - echo ' _NIX_TEST_ACCEPT=1 make tests/functional/lang.sh.test' + echo ' _NIX_TEST_ACCEPT=1 just test --suite installcheck -v functional-lang' echo '' echo 'to regenerate the files containing the expected output,' echo 'and then view the git diff to decide whether a change is' |