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-shell.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-shell.sh')
| -rw-r--r-- | tests/guix-shell.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/guix-shell.sh b/tests/guix-shell.sh index cb2b53466d..ed368515eb 100644 --- a/tests/guix-shell.sh +++ b/tests/guix-shell.sh @@ -33,13 +33,13 @@ export XDG_CONFIG_HOME guix shell --bootstrap --pure guile-bootstrap -- guile --version # '--symlink' can only be used with --container. -! guix shell --bootstrap guile-bootstrap -S /dummy=bin/guile +guix shell --bootstrap guile-bootstrap -S /dummy=bin/guile && false # '--ad-hoc' is a thing of the past. -! guix shell --ad-hoc guile-bootstrap +guix shell --ad-hoc guile-bootstrap && false # Rejecting unsupported packages. -! guix shell -s armhf-linux intelmetool -n +guix shell -s armhf-linux intelmetool -n && false # Test approximately that the child process does not inherit extra file # descriptors. Ideally we'd check there's nothing more than 0, 1, and 2, but @@ -55,7 +55,7 @@ test "$(echo $fd_list | wc -w)" -le "$(echo $initial_fd_list | wc -w)" cat > "$tmpdir/guix.scm" <<EOF This is a broken guix.scm file. EOF -! (cd "$tmpdir"; SHELL="$(type -P true)" guix shell --bootstrap 2> "stderr") +(cd "$tmpdir"; SHELL="$(type -P true)" guix shell --bootstrap 2> "stderr") && false grep "not authorized" "$tmpdir/stderr" rm "$tmpdir/stderr" @@ -122,7 +122,7 @@ then done # 'make-boot0' itself must not be listed. - ! guix gc --references "$profile" | grep make-boot0 + guix gc --references "$profile" | grep make-boot0 && false # Honoring the local 'guix.scm' file. echo '(@ (guix tests) gnu-make-for-tests)' > "$tmpdir/guix.scm" |