diff options
57 files changed, 88 insertions, 84 deletions
diff --git a/test/units/testsuite-02.sh b/test/units/testsuite-02.sh index 1ff1c3347b..b0807c9d8a 100755 --- a/test/units/testsuite-02.sh +++ b/test/units/testsuite-02.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -#set -ex -#set -o pipefail +set -eux +set -o pipefail NPROC=$(nproc) MAX_QUEUE_SIZE=${NPROC:-2} diff --git a/test/units/testsuite-03.sh b/test/units/testsuite-03.sh index 5a2dadd6b8..82858f0c8e 100755 --- a/test/units/testsuite-03.sh +++ b/test/units/testsuite-03.sh @@ -1,5 +1,6 @@ #!/usr/bin/env bash -set -ex +set -eux +set -o pipefail # Test merging of a --job-mode=ignore-dependencies job into a previously # installed job. diff --git a/test/units/testsuite-04.sh b/test/units/testsuite-04.sh index a2a1292380..0969a8313e 100755 --- a/test/units/testsuite-04.sh +++ b/test/units/testsuite-04.sh @@ -1,6 +1,5 @@ #!/usr/bin/env bash -set -x -set -e +set -eux set -o pipefail # Test stdout stream diff --git a/test/units/testsuite-05.sh b/test/units/testsuite-05.sh index 9168e72799..f899fcaa4f 100755 --- a/test/units/testsuite-05.sh +++ b/test/units/testsuite-05.sh @@ -1,6 +1,5 @@ #!/usr/bin/env bash -set -x -set -e +set -eux set -o pipefail P=/run/systemd/system.conf.d diff --git a/test/units/testsuite-06.sh b/test/units/testsuite-06.sh index f9b106da7b..f89698ded4 100755 --- a/test/units/testsuite-06.sh +++ b/test/units/testsuite-06.sh @@ -1,6 +1,5 @@ #!/usr/bin/env bash -set -x -set -e +set -eux set -o pipefail echo 1 >/sys/fs/selinux/enforce || { diff --git a/test/units/testsuite-07.sh b/test/units/testsuite-07.sh index fbb2d1d30a..c63394e68c 100755 --- a/test/units/testsuite-07.sh +++ b/test/units/testsuite-07.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -set -x -set -e +set -eux +set -o pipefail >/failed diff --git a/test/units/testsuite-11.sh b/test/units/testsuite-11.sh index 708c7cebb7..3ec391f6e6 100755 --- a/test/units/testsuite-11.sh +++ b/test/units/testsuite-11.sh @@ -1,5 +1,6 @@ #!/usr/bin/env bash -set -x +set -eux +set -o pipefail systemctl start fail-on-restart.service active_state=$(systemctl show --value --property ActiveState fail-on-restart.service) diff --git a/test/units/testsuite-12.sh b/test/units/testsuite-12.sh index 7e7b0ec25a..a02f38c488 100755 --- a/test/units/testsuite-12.sh +++ b/test/units/testsuite-12.sh @@ -1,6 +1,5 @@ #!/usr/bin/env bash -set -x -set -e +set -eux set -o pipefail U=/run/systemd/system/test12.socket diff --git a/test/units/testsuite-13.sh b/test/units/testsuite-13.sh index 3e66aa9d54..03b1bc3971 100755 --- a/test/units/testsuite-13.sh +++ b/test/units/testsuite-13.sh @@ -1,7 +1,6 @@ #!/usr/bin/env bash -set -x -set -e -set -u +# shellcheck disable=SC2016 +set -eux set -o pipefail export SYSTEMD_LOG_LEVEL=debug diff --git a/test/units/testsuite-14.sh b/test/units/testsuite-14.sh index 95ac9b65ae..6eecf916a2 100755 --- a/test/units/testsuite-14.sh +++ b/test/units/testsuite-14.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -set -e -set -x +set -eux +set -o pipefail function setup_root { local _root="$1" diff --git a/test/units/testsuite-15.sh b/test/units/testsuite-15.sh index fc392c584d..018ae8aab9 100755 --- a/test/units/testsuite-15.sh +++ b/test/units/testsuite-15.sh @@ -1,6 +1,6 @@ -#! /bin/bash -set -e -set -x +#!/bin/bash +set -eux +set -o pipefail _clear_service () { systemctl stop $1.service 2>/dev/null || : diff --git a/test/units/testsuite-16.sh b/test/units/testsuite-16.sh index 8388ef7a5d..8d2117b4cf 100755 --- a/test/units/testsuite-16.sh +++ b/test/units/testsuite-16.sh @@ -1,5 +1,6 @@ #!/usr/bin/env bash -set -v -x +set -eux +set -o pipefail rm -f /test.log diff --git a/test/units/testsuite-17.sh b/test/units/testsuite-17.sh index afce85aceb..3cf57550fc 100755 --- a/test/units/testsuite-17.sh +++ b/test/units/testsuite-17.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash -set -x -set -e +set -eux +set -o pipefail >/failed diff --git a/test/units/testsuite-18.sh b/test/units/testsuite-18.sh index c4e3ca2110..fe4f9ce5e0 100755 --- a/test/units/testsuite-18.sh +++ b/test/units/testsuite-18.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -ex +set -eux set -o pipefail systemd-run --wait -p FailureAction=poweroff true diff --git a/test/units/testsuite-19.sh b/test/units/testsuite-19.sh index dea2f4ba1f..8ea89e6cfe 100755 --- a/test/units/testsuite-19.sh +++ b/test/units/testsuite-19.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -ex +set -eux set -o pipefail if grep -q cgroup2 /proc/filesystems ; then diff --git a/test/units/testsuite-20.sh b/test/units/testsuite-20.sh index 6003e4f181..56f07933a9 100755 --- a/test/units/testsuite-20.sh +++ b/test/units/testsuite-20.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -ex +set -eux set -o pipefail systemd-analyze log-level debug diff --git a/test/units/testsuite-22.01.sh b/test/units/testsuite-22.01.sh index b10b5aaa1a..7975980799 100755 --- a/test/units/testsuite-22.01.sh +++ b/test/units/testsuite-22.01.sh @@ -1,10 +1,11 @@ -#! /bin/bash +#!/bin/bash # # With "e" don't attempt to set permissions when file doesn't exist, see # https://github.com/systemd/systemd/pull/6682. # -set -e +set -eux +set -o pipefail rm -fr /tmp/test diff --git a/test/units/testsuite-22.02.sh b/test/units/testsuite-22.02.sh index c337cd6e05..5d1254db03 100755 --- a/test/units/testsuite-22.02.sh +++ b/test/units/testsuite-22.02.sh @@ -1,10 +1,10 @@ -#! /bin/bash +#!/bin/bash # # Basic tests for types creating directories # -set -e -set -x +set -eux +set -o pipefail rm -fr /tmp/{C,d,D,e} mkdir /tmp/{C,d,D,e} diff --git a/test/units/testsuite-22.03.sh b/test/units/testsuite-22.03.sh index c905784bee..bb321c1c2f 100755 --- a/test/units/testsuite-22.03.sh +++ b/test/units/testsuite-22.03.sh @@ -1,10 +1,10 @@ -#! /bin/bash +#!/bin/bash # # Basic tests for types creating/writing files # -set -e -set -x +set -eux +set -o pipefail rm -fr /tmp/{f,F,w} mkdir /tmp/{f,F,w} diff --git a/test/units/testsuite-22.04.sh b/test/units/testsuite-22.04.sh index fc90ab4dc7..3298aa04ed 100755 --- a/test/units/testsuite-22.04.sh +++ b/test/units/testsuite-22.04.sh @@ -1,10 +1,10 @@ -#! /bin/bash +#!/bin/bash # # Basic tests for types creating fifos # -set -e -set -x +set -eux +set -o pipefail rm -fr /tmp/p mkdir /tmp/p diff --git a/test/units/testsuite-22.05.sh b/test/units/testsuite-22.05.sh index 13c4ac80fc..a1820089c0 100755 --- a/test/units/testsuite-22.05.sh +++ b/test/units/testsuite-22.05.sh @@ -1,7 +1,7 @@ #! /bin/bash -set -e -set -x +set -eux +set -o pipefail rm -fr /tmp/{z,Z} mkdir /tmp/{z,Z} diff --git a/test/units/testsuite-22.06.sh b/test/units/testsuite-22.06.sh index 8ce0a08f68..ce5b1bf698 100755 --- a/test/units/testsuite-22.06.sh +++ b/test/units/testsuite-22.06.sh @@ -1,9 +1,10 @@ -#! /bin/bash +#!/bin/bash # # Inspired by https://github.com/systemd/systemd/issues/9508 # -set -e +set -eux +set -o pipefail test_snippet() { systemd-tmpfiles "$@" - <<EOF diff --git a/test/units/testsuite-22.07.sh b/test/units/testsuite-22.07.sh index 74286a3305..8d61032d27 100755 --- a/test/units/testsuite-22.07.sh +++ b/test/units/testsuite-22.07.sh @@ -1,10 +1,10 @@ -#! /bin/bash +#!/bin/bash # # Verifies the issues described by https://github.com/systemd/systemd/issues/10191 # -set -e -set -x +set -eux +set -o pipefail rm -rf /tmp/test-prefix diff --git a/test/units/testsuite-22.08.sh b/test/units/testsuite-22.08.sh index 01d3bdb50c..e4272f8ea3 100755 --- a/test/units/testsuite-22.08.sh +++ b/test/units/testsuite-22.08.sh @@ -1,4 +1,4 @@ -#! /bin/bash +#!/bin/bash # # Verify tmpfiles can run in a root directory under a path prefix that contains # directories owned by unprivileged users, for example when a root file system @@ -7,7 +7,8 @@ # https://github.com/systemd/systemd/pull/11820 # -set -e +set -eux +set -o pipefail rm -fr /tmp/root /tmp/user mkdir -p /tmp/root /tmp/user/root diff --git a/test/units/testsuite-22.09.sh b/test/units/testsuite-22.09.sh index c558dfd4db..c852f778ef 100755 --- a/test/units/testsuite-22.09.sh +++ b/test/units/testsuite-22.09.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash -set -e -set -x +set -eux +set -o pipefail # Make sure that the "stat" output is not locale dependent. export LANG=C LC_ALL=C diff --git a/test/units/testsuite-22.10.sh b/test/units/testsuite-22.10.sh index 5ec297fbf8..d650b2145c 100755 --- a/test/units/testsuite-22.10.sh +++ b/test/units/testsuite-22.10.sh @@ -1,7 +1,6 @@ #!/usr/bin/env bash -set -e -set -x +set -eux set -o pipefail systemd-tmpfiles --create - <<EOF diff --git a/test/units/testsuite-22.sh b/test/units/testsuite-22.sh index afce85aceb..3cf57550fc 100755 --- a/test/units/testsuite-22.sh +++ b/test/units/testsuite-22.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash -set -x -set -e +set -eux +set -o pipefail >/failed diff --git a/test/units/testsuite-23.sh b/test/units/testsuite-23.sh index a215237562..c66ed26229 100755 --- a/test/units/testsuite-23.sh +++ b/test/units/testsuite-23.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -ex +set -eux set -o pipefail systemd-analyze log-level debug diff --git a/test/units/testsuite-25.sh b/test/units/testsuite-25.sh index d4d2e0f953..05448efb0a 100755 --- a/test/units/testsuite-25.sh +++ b/test/units/testsuite-25.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -ex +set -eux set -o pipefail export SYSTEMD_PAGER=cat diff --git a/test/units/testsuite-26.sh b/test/units/testsuite-26.sh index 9c1abc5916..7982099307 100755 --- a/test/units/testsuite-26.sh +++ b/test/units/testsuite-26.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -ex +set -eux set -o pipefail # Make sure PATH is set diff --git a/test/units/testsuite-27.sh b/test/units/testsuite-27.sh index 0e9ffe1189..2248380351 100755 --- a/test/units/testsuite-27.sh +++ b/test/units/testsuite-27.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -ex +set -eux set -o pipefail systemd-analyze log-level debug diff --git a/test/units/testsuite-29.sh b/test/units/testsuite-29.sh index 4e91aa7336..3408e6d71a 100755 --- a/test/units/testsuite-29.sh +++ b/test/units/testsuite-29.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- # ex: ts=8 sw=4 sts=4 et filetype=sh -set -ex +set -eux set -o pipefail export SYSTEMD_LOG_LEVEL=debug diff --git a/test/units/testsuite-30.sh b/test/units/testsuite-30.sh index cb3b46d2cb..ac8a3e06cf 100755 --- a/test/units/testsuite-30.sh +++ b/test/units/testsuite-30.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -ex +set -eux set -o pipefail systemd-analyze log-level debug diff --git a/test/units/testsuite-31.sh b/test/units/testsuite-31.sh index 42873bfd83..a9a50e1470 100755 --- a/test/units/testsuite-31.sh +++ b/test/units/testsuite-31.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -e +set -eux set -o pipefail if journalctl -b -t systemd --grep '\.device: Changed plugged -> dead'; then diff --git a/test/units/testsuite-32.sh b/test/units/testsuite-32.sh index c1704ab34e..d7827090bb 100755 --- a/test/units/testsuite-32.sh +++ b/test/units/testsuite-32.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -ex +set -eux set -o pipefail # Let's run this test only if the "memory.oom.group" cgroupfs attribute diff --git a/test/units/testsuite-33.sh b/test/units/testsuite-33.sh index 929c76062b..6e750f63a3 100755 --- a/test/units/testsuite-33.sh +++ b/test/units/testsuite-33.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- # ex: ts=8 sw=4 sts=4 et filetype=sh -set -ex +set -eux set -o pipefail cat >/etc/systemd/system/testservice.service <<EOF diff --git a/test/units/testsuite-34.sh b/test/units/testsuite-34.sh index ca54a01f40..394b220d60 100755 --- a/test/units/testsuite-34.sh +++ b/test/units/testsuite-34.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -ex +set -eux set -o pipefail systemd-analyze log-level debug diff --git a/test/units/testsuite-36.sh b/test/units/testsuite-36.sh index 3decf4b3f3..46c08017d1 100755 --- a/test/units/testsuite-36.sh +++ b/test/units/testsuite-36.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -ex +set -eux set -o pipefail at_exit() { diff --git a/test/units/testsuite-37.sh b/test/units/testsuite-37.sh index 3ae0cb32fe..c3eb5344d1 100755 --- a/test/units/testsuite-37.sh +++ b/test/units/testsuite-37.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- # ex: ts=8 sw=4 sts=4 et filetype=sh -set -ex +set -eux set -o pipefail systemd-mount -p RuntimeDirectory=hoge -p RuntimeDirectoryPreserve=yes -t tmpfs tmpfs /tmp/aaa diff --git a/test/units/testsuite-38.sh b/test/units/testsuite-38.sh index 707fd8a864..baf52fd499 100755 --- a/test/units/testsuite-38.sh +++ b/test/units/testsuite-38.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -set -ex +set -eux set -o pipefail systemd-analyze log-level debug diff --git a/test/units/testsuite-39.sh b/test/units/testsuite-39.sh index 5c0680878f..90da2bf5e1 100755 --- a/test/units/testsuite-39.sh +++ b/test/units/testsuite-39.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -set -ex +set -eux set -o pipefail systemd-analyze log-level debug diff --git a/test/units/testsuite-40.sh b/test/units/testsuite-40.sh index 7593401369..fdb052c39c 100755 --- a/test/units/testsuite-40.sh +++ b/test/units/testsuite-40.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -ex +set -eux set -o pipefail systemd-analyze log-level debug diff --git a/test/units/testsuite-41.sh b/test/units/testsuite-41.sh index 0a43f8ba57..527213fcf8 100755 --- a/test/units/testsuite-41.sh +++ b/test/units/testsuite-41.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -ex +set -eux set -o pipefail # wait this many secs for each test service to succeed in what is being tested diff --git a/test/units/testsuite-42.sh b/test/units/testsuite-42.sh index ca13c5dec5..e47fab46e6 100755 --- a/test/units/testsuite-42.sh +++ b/test/units/testsuite-42.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -ex +set -eux systemd-analyze log-level debug diff --git a/test/units/testsuite-43.sh b/test/units/testsuite-43.sh index f3c0ca4fd2..dcbe32def6 100755 --- a/test/units/testsuite-43.sh +++ b/test/units/testsuite-43.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -ex +set -eux set -o pipefail systemd-analyze log-level debug diff --git a/test/units/testsuite-44.sh b/test/units/testsuite-44.sh index 0badb71125..50b5c3046f 100755 --- a/test/units/testsuite-44.sh +++ b/test/units/testsuite-44.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -ex +set -eux systemd-analyze log-level debug diff --git a/test/units/testsuite-46.sh b/test/units/testsuite-46.sh index d3f0f71043..686c7f5bc9 100755 --- a/test/units/testsuite-46.sh +++ b/test/units/testsuite-46.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -ex +set -eux set -o pipefail # Check if homectl is installed, and if it isn't bail out early instead of failing diff --git a/test/units/testsuite-47.sh b/test/units/testsuite-47.sh index f8529083a2..c1714d14d0 100755 --- a/test/units/testsuite-47.sh +++ b/test/units/testsuite-47.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -ex +set -eux set -o pipefail systemd-analyze log-level debug diff --git a/test/units/testsuite-48.sh b/test/units/testsuite-48.sh index ea84b1d723..0ce8e9c067 100755 --- a/test/units/testsuite-48.sh +++ b/test/units/testsuite-48.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- # ex: ts=8 sw=4 sts=4 et filetype=sh -set -ex +set -eux cat >/run/systemd/system/testservice-48.target <<EOF [Unit] diff --git a/test/units/testsuite-49.sh b/test/units/testsuite-49.sh index f92280f884..8e360b4951 100755 --- a/test/units/testsuite-49.sh +++ b/test/units/testsuite-49.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -ex +set -eux echo "MARKER_FIXED" >/run/testservice-49-fixed mkdir -p /run/inaccessible diff --git a/test/units/testsuite-50.sh b/test/units/testsuite-50.sh index b3c120d9a6..8067997a9d 100755 --- a/test/units/testsuite-50.sh +++ b/test/units/testsuite-50.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- # ex: ts=8 sw=4 sts=4 et filetype=sh -set -ex +set -eux set -o pipefail export SYSTEMD_LOG_LEVEL=debug diff --git a/test/units/testsuite-51.sh b/test/units/testsuite-51.sh index 246412a079..06bc1602f8 100755 --- a/test/units/testsuite-51.sh +++ b/test/units/testsuite-51.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -ex +set -eux set -o pipefail systemctl start testsuite-51-repro-1 diff --git a/test/units/testsuite-53.sh b/test/units/testsuite-53.sh index 3536c24271..298d5d50eb 100755 --- a/test/units/testsuite-53.sh +++ b/test/units/testsuite-53.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -ex +set -eux set -o pipefail >/failed diff --git a/test/units/testsuite-54.sh b/test/units/testsuite-54.sh index d145d7e33e..f8ddff4a30 100755 --- a/test/units/testsuite-54.sh +++ b/test/units/testsuite-54.sh @@ -1,5 +1,6 @@ #!/usr/bin/env bash -set -ex +# shellcheck disable=SC2016 +set -eux systemd-analyze log-level debug diff --git a/test/units/testsuite-55-slowgrowth.sh b/test/units/testsuite-55-slowgrowth.sh index ff5a747348..ed4ec6d6e4 100755 --- a/test/units/testsuite-55-slowgrowth.sh +++ b/test/units/testsuite-55-slowgrowth.sh @@ -1,5 +1,8 @@ #!/usr/bin/env bash -set -eu -o pipefail +# Don't use set -x here, since it generates a lot of output and slows +# the script down, causing unexpected test fails. +set -eu +set -o pipefail PAGE_SIZE=$(getconf PAGE_SIZE) BLOAT_ITERATION_TARGET=$(( 100 << 20 )) # 100 MB diff --git a/test/units/testsuite-55.sh b/test/units/testsuite-55.sh index d73f4b1e7a..25c7f8cc63 100755 --- a/test/units/testsuite-55.sh +++ b/test/units/testsuite-55.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -ex +set -eux set -o pipefail systemd-analyze log-level debug diff --git a/test/units/testsuite-56.sh b/test/units/testsuite-56.sh index 079da07201..27bd3ca8f7 100755 --- a/test/units/testsuite-56.sh +++ b/test/units/testsuite-56.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -ex +set -eux systemd-analyze log-level debug |