diff options
author | Eric Bavier <bavier@posteo.net> | 2023-04-20 00:11:27 -0500 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2023-04-21 16:16:38 +0200 |
commit | 37dd69b44511dc73eb04bdebe8d82c9a0386338e (patch) | |
tree | d20ecc2b15659ed2345f00beb39170a5365a7051 /tests/guix-style.sh | |
parent | a09c7da8f8d8e732f969cf0a09aaa78f87032ab1 (diff) | |
download | guix-37dd69b44511dc73eb04bdebe8d82c9a0386338e.tar guix-37dd69b44511dc73eb04bdebe8d82c9a0386338e.tar.gz |
tests: Fix checks for expected failures.
Addresses <https://issues.guix.gnu.org/62406>.
With 'set -e', a return status inverted with '!' does not cause the shell to
exit immediately. Instead use '&& false' to indicate an expected failure.
* tests/guix-archive.sh, tests/guix-build-branch.sh, tests/guix-build.sh,
tests/guix-daemon.sh, tests/guix-download.sh,
tests/guix-environment-container.sh, tests/guix-environment.sh,
tests/guix-gc.sh, tests/guix-git-authenticate.sh, tests/guix-graph.sh,
tests/guix-hash.sh, tests/guix-home.sh, tests/guix-pack-relocatable.sh,
tests/guix-pack.sh, tests/guix-package-aliases.sh, tests/guix-package-net.sh,
tests/guix-package.sh, tests/guix-refresh.sh, tests/guix-shell.sh,
tests/guix-style.sh, tests/guix-system.sh: Replace uses of '! ...' with
'... && false' or `test ! ...` as appropriate.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'tests/guix-style.sh')
-rw-r--r-- | tests/guix-style.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/guix-style.sh b/tests/guix-style.sh index 58f953a0ec..2de879d5e3 100644 --- a/tests/guix-style.sh +++ b/tests/guix-style.sh @@ -65,7 +65,7 @@ cp "$tmpfile" "$tmpfile.bak" initial_hash="$(guix hash "$tmpfile")" guix style -f "$tmpfile" -if ! test "$initial_hash" = "$(guix hash "$tmpfile")" +if test "$initial_hash" != "$(guix hash "$tmpfile")" then cat "$tmpfile" diff -u "$tmpfile.bak" "$tmpfile" @@ -73,8 +73,8 @@ then fi # Introduce random changes and try again. -sed -i "$tmpfile" -e's/ +/ /g' -! test "$initial_hash" = "$(guix hash "$tmpfile")" +sed -i "$tmpfile" -e's/ \+/ /g' +test "$initial_hash" != "$(guix hash "$tmpfile")" guix style -f "$tmpfile" test "$initial_hash" = "$(guix hash "$tmpfile")" |