diff options
| author | eldritch horrors <pennae@lix.systems> | 2024-09-25 23:57:46 +0200 |
|---|---|---|
| committer | eldritch horrors <pennae@lix.systems> | 2024-09-29 14:29:14 +0000 |
| commit | 7f4f86795cc4215d0b8906d2203976768c5f7b21 (patch) | |
| tree | 0bdbe948d7f35bc7e011e323ca241f8a62e91c6e /tests/functional | |
| parent | a5240b23abba2724073f79b79648bf4afb38f70a (diff) | |
libstore: remove Goal::key
this was a debugging aid from day one that should not have any impact on
build semantics, and if it *does* have an impact on build semantics then
build semantics are seriously broken. keeping the order imposed by these
keys will be impossible once we let a real event loop schedule our jobs.
Change-Id: I5c313324e1f213ab6453d82f41ae5e59de809a5b
Diffstat (limited to 'tests/functional')
| -rw-r--r-- | tests/functional/build.sh | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tests/functional/build.sh b/tests/functional/build.sh index f80711b31..a14f6e3c2 100644 --- a/tests/functional/build.sh +++ b/tests/functional/build.sh @@ -146,11 +146,8 @@ 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 -<<<"$out" grepQuiet -E "hash mismatch in fixed-output derivation '.*-x1\\.drv'" -<<<"$out" grepQuiet -vE "hash mismatch in fixed-output derivation '.*-x3\\.drv'" -<<<"$out" grepQuiet -vE "hash mismatch in fixed-output derivation '.*-x2\\.drv'" -<<<"$out" grepQuiet -E "likely URL: https://meow.puppy.forge/puppy.tar.gz" -<<<"$out" grepQuiet -vE "likely URL: https://kitty.forge/cat.tar.gz" +<<<"$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" out="$(nix build -f fod-failing.nix -L x1 x2 x3 --keep-going 2>&1)" && status=0 || status=$? |