diff options
| author | jade <lix@jade.fyi> | 2024-07-01 16:11:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@localhost> | 2024-07-01 16:11:32 +0000 |
| commit | d3286d0990da111c536c2f879d8f9cbbd650ebae (patch) | |
| tree | 41cc3c6e9c5d4ab90f0ae87080cddef6cd6ce792 /tests/functional/build.sh | |
| parent | 010ff57ebb40f1a9aaff99867d2886f0e59f774a (diff) | |
| parent | d85309f7ca154c014cf53777c76df5af44b50500 (diff) | |
Merge changes Ie29a8a89,I873eedcf into main
* changes:
store: delete obsolete lsof-disabling code
store: guess the URL of failing fixed-output derivations
Diffstat (limited to 'tests/functional/build.sh')
| -rw-r--r-- | tests/functional/build.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/functional/build.sh b/tests/functional/build.sh index 95a20dc6a..a540cf8fd 100644 --- a/tests/functional/build.sh +++ b/tests/functional/build.sh @@ -142,6 +142,8 @@ 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 "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=$? @@ -151,6 +153,9 @@ test "$(<<<"$out" grep -E '^error:' | wc -l)" = 4 <<<"$out" grepQuiet -E "hash mismatch in fixed-output derivation '.*-x1\\.drv'" <<<"$out" grepQuiet -E "hash mismatch in fixed-output derivation '.*-x3\\.drv'" <<<"$out" grepQuiet -E "hash mismatch in fixed-output derivation '.*-x2\\.drv'" +<<<"$out" grepQuiet -E "likely URL: https://meow.puppy.forge/puppy.tar.gz" +<<<"$out" grepQuiet -E "likely URL: https://kitty.forge/cat.tar.gz" +<<<"$out" grepQuiet -E "likely URL: \(unknown\)" <<<"$out" grepQuiet -E "error: build of '.*-x[1-3]\\.drv\\^out', '.*-x[1-3]\\.drv\\^out', '.*-x[1-3]\\.drv\\^out' failed" out="$(nix build -f fod-failing.nix -L x4 2>&1)" && status=0 || status=$? |