test: drop || return 1 expression which is incompatible with set -e

The `set -e` option is incompatible with a subshell/compound command, which is followed by || <EXPR>. In such case, the -e option is ignored in all affected subshells/functions (see man bash(1) for command `set`).
2024-12-22 13:33:56 +03:00 · 2019-07-08 21:11:32 +02:00 · 2019-07-08 21:11:32 +02:00 · cc469c3dfc
commit cc469c3dfc
parent 71a0de36e5
30 changed files with 30 additions and 30 deletions
--- a/test/TEST-01-BASIC/test.sh
+++ b/test/TEST-01-BASIC/test.sh
@ -29,7 +29,7 @@ Type=oneshot
 EOF

        setup_testsuite
-    ) || return 1
+    )
    setup_nspawn_root

    ddebug "umount $TESTDIR/root"
--- a/test/TEST-02-CRYPTSETUP/test.sh
+++ b/test/TEST-02-CRYPTSETUP/test.sh
@ -75,7 +75,7 @@ EOF
        cat >>$initdir/etc/fstab <<EOF
 /dev/mapper/varcrypt    /var    ext4    defaults 0 1
 EOF
-    ) || return 1
+    )

    ddebug "umount $TESTDIR/root/var"
    umount $TESTDIR/root/var
--- a/test/TEST-03-JOBS/test.sh
+++ b/test/TEST-03-JOBS/test.sh
@ -44,7 +44,7 @@ EOF
        cp test-jobs.sh $initdir/

        setup_testsuite
-    ) || return 1
+    )
    setup_nspawn_root

    ddebug "umount $TESTDIR/root"
--- a/test/TEST-04-JOURNAL/test.sh
+++ b/test/TEST-04-JOURNAL/test.sh
@ -46,7 +46,7 @@ EOF
        cp test-journal.sh $initdir/

        setup_testsuite
-    ) || return 1
+    )
    setup_nspawn_root

    ddebug "umount $TESTDIR/root"
--- a/test/TEST-05-RLIMITS/test.sh
+++ b/test/TEST-05-RLIMITS/test.sh
@ -42,7 +42,7 @@ EOF
        cp test-rlimits.sh $initdir/

        setup_testsuite
-    ) || return 1
+    )
    setup_nspawn_root

    ddebug "umount $TESTDIR/root"
--- a/test/TEST-06-SELINUX/test.sh
+++ b/test/TEST-06-SELINUX/test.sh
@ -92,7 +92,7 @@ EOF
        dracut_install -o sesearch
        dracut_install runcon
        dracut_install checkmodule semodule semodule_package m4 make /usr/libexec/selinux/hll/pp load_policy sefcontext_compile
-    ) || return 1
+    )

    # mask some services that we do not want to run in these tests
    ln -s /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
--- a/test/TEST-07-ISSUE-1981/test.sh
+++ b/test/TEST-07-ISSUE-1981/test.sh
@ -40,7 +40,7 @@ EOF
        cp test-segfault.sh $initdir/

        setup_testsuite
-    ) || return 1
+    )
    setup_nspawn_root

    ddebug "umount $TESTDIR/root"
--- a/test/TEST-08-ISSUE-2730/test.sh
+++ b/test/TEST-08-ISSUE-2730/test.sh
@ -60,7 +60,7 @@ ExecStart=/bin/systemctl reload /
 EOF

        setup_testsuite
-    ) || return 1
+    )

    ln -s /etc/systemd/system/-.mount $initdir/etc/systemd/system/root.mount
    mkdir -p $initdir/etc/systemd/system/local-fs.target.wants
--- a/test/TEST-09-ISSUE-2691/test.sh
+++ b/test/TEST-09-ISSUE-2691/test.sh
@ -32,7 +32,7 @@ TimeoutStopSec=270s
 EOF

        setup_testsuite
-    ) || return 1
+    )

    # mask some services that we do not want to run in these tests
    ln -s /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
--- a/test/TEST-10-ISSUE-2467/test.sh
+++ b/test/TEST-10-ISSUE-2467/test.sh
@ -45,7 +45,7 @@ ExecStart=/bin/true
 EOF

        setup_testsuite
-    ) || return 1
+    )
    setup_nspawn_root

    # mask some services that we do not want to run in these tests
--- a/test/TEST-11-ISSUE-3166/test.sh
+++ b/test/TEST-11-ISSUE-3166/test.sh
@ -64,7 +64,7 @@ EOF

        chmod 0755 $initdir/test-fail-on-restart.sh
        setup_testsuite
-    ) || return 1
+    )

    ddebug "umount $TESTDIR/root"
    umount $TESTDIR/root
--- a/test/TEST-12-ISSUE-3171/test.sh
+++ b/test/TEST-12-ISSUE-3171/test.sh
@ -90,7 +90,7 @@ EOF

        chmod 0755 $initdir/test-socket-group.sh
        setup_testsuite
-    ) || return 1
+    )

    setup_nspawn_root

--- a/test/TEST-13-NSPAWN-SMOKE/test.sh
+++ b/test/TEST-13-NSPAWN-SMOKE/test.sh
@ -184,7 +184,7 @@ EOF

        chmod 0755 $initdir/test-nspawn.sh
        setup_testsuite
-    ) || return 1
+    )

    ddebug "umount $TESTDIR/root"
    umount $TESTDIR/root
--- a/test/TEST-14-MACHINE-ID/test.sh
+++ b/test/TEST-14-MACHINE-ID/test.sh
@ -73,7 +73,7 @@ EOF
 chmod +x $initdir/test-machine-id-setup.sh

        setup_testsuite
-    ) || return 1
+    )

    # mask some services that we do not want to run in these tests
    ln -s /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
--- a/test/TEST-16-EXTEND-TIMEOUT/test.sh
+++ b/test/TEST-16-EXTEND-TIMEOUT/test.sh
@ -30,7 +30,7 @@ test_setup() {
        cp $BUILD_DIR/src/shared/libsystemd-shared-*.so ${initdir}/usr/lib

        setup_testsuite
-    ) || return 1
+    )
    # mask some services that we do not want to run in these tests
    ln -s /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
    ln -s /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
--- a/test/TEST-17-UDEV-WANTS/test.sh
+++ b/test/TEST-17-UDEV-WANTS/test.sh
@ -38,7 +38,7 @@ EOF
        cp testsuite.sh $initdir/

        setup_testsuite
-    ) || return 1
+    )

    ddebug "umount $TESTDIR/root"
    umount $TESTDIR/root
--- a/test/TEST-18-FAILUREACTION/test.sh
+++ b/test/TEST-18-FAILUREACTION/test.sh
@ -30,7 +30,7 @@ EOF
        cp testsuite.sh $initdir/

        setup_testsuite
-    ) || return 1
+    )
    setup_nspawn_root

    # mask some services that we do not want to run in these tests
--- a/test/TEST-19-DELEGATE/test.sh
+++ b/test/TEST-19-DELEGATE/test.sh
@ -40,7 +40,7 @@ EOF
        cp testsuite.sh $initdir/

        setup_testsuite
-    ) || return 1
+    )

    ddebug "umount $TESTDIR/root"
    umount $TESTDIR/root
--- a/test/TEST-20-MAINPIDGAMES/test.sh
+++ b/test/TEST-20-MAINPIDGAMES/test.sh
@ -38,7 +38,7 @@ EOF
        cp testsuite.sh $initdir/

        setup_testsuite
-    ) || return 1
+    )
    setup_nspawn_root

    ddebug "umount $TESTDIR/root"
--- a/test/TEST-23-TYPE-EXEC/test.sh
+++ b/test/TEST-23-TYPE-EXEC/test.sh
@ -38,7 +38,7 @@ EOF
        cp testsuite.sh $initdir/

        setup_testsuite
-    ) || return 1
+    )
    setup_nspawn_root

    ddebug "umount $TESTDIR/root"
--- a/test/TEST-24-UNIT-TESTS/test.sh
+++ b/test/TEST-24-UNIT-TESTS/test.sh
@ -91,7 +91,7 @@ EOF
        cp testsuite.sh $initdir/

        setup_testsuite
-    ) || return 1
+    )
    setup_nspawn_root

    # mask some services that we do not want to run in these tests
--- a/test/TEST-25-IMPORT/test.sh
+++ b/test/TEST-25-IMPORT/test.sh
@ -31,7 +31,7 @@ EOF
        cp testsuite.sh $initdir/

        setup_testsuite
-    ) || return 1
+    )
    setup_nspawn_root

    ddebug "umount $TESTDIR/root"
--- a/test/TEST-26-SETENV/test.sh
+++ b/test/TEST-26-SETENV/test.sh
@ -30,7 +30,7 @@ EOF
        cp testsuite.sh $initdir/

        setup_testsuite
-    ) || return 1
+    )
    setup_nspawn_root

    ddebug "umount $TESTDIR/root"
--- a/test/TEST-27-STDOUTFILE/test.sh
+++ b/test/TEST-27-STDOUTFILE/test.sh
@ -40,7 +40,7 @@ EOF
        cp testsuite.sh $initdir/

        setup_testsuite
-    ) || return 1
+    )
    setup_nspawn_root

    ddebug "umount $TESTDIR/root"
--- a/test/TEST-28-PERCENTJ-WANTEDBY/test.sh
+++ b/test/TEST-28-PERCENTJ-WANTEDBY/test.sh
@ -49,7 +49,7 @@ ExecStart=/bin/true
 EOF

        setup_testsuite
-    ) || return 1
+    )
    setup_nspawn_root

        # mask some services that we do not want to run in these tests
--- a/test/TEST-29-UDEV-ID_RENAMING/test.sh
+++ b/test/TEST-29-UDEV-ID_RENAMING/test.sh
@ -38,7 +38,7 @@ EOF
        cp testsuite.sh $initdir/

        setup_testsuite
-    ) || return 1
+    )

    ddebug "umount $TESTDIR/root"
    umount $TESTDIR/root
--- a/test/TEST-30-ONCLOCKCHANGE/test.sh
+++ b/test/TEST-30-ONCLOCKCHANGE/test.sh
@ -49,7 +49,7 @@ EOF
        cp testsuite.sh $initdir/

        setup_testsuite
-    ) || return 1
+    )

    ddebug "umount $TESTDIR/root"
    umount $TESTDIR/root
--- a/test/TEST-31-DEVICE-ENUMERATION/test.sh
+++ b/test/TEST-31-DEVICE-ENUMERATION/test.sh
@ -38,7 +38,7 @@ EOF
        cp testsuite.sh $initdir/

        setup_testsuite
-    ) || return 1
+    )

    ddebug "umount $TESTDIR/root"
    umount $TESTDIR/root
--- a/test/TEST-32-OOMPOLICY/test.sh
+++ b/test/TEST-32-OOMPOLICY/test.sh
@ -41,7 +41,7 @@ EOF
        cp testsuite.sh $initdir/

        setup_testsuite
-    ) || return 1
+    )

    ddebug "umount $TESTDIR/root"
    umount $TESTDIR/root
--- a/test/TEST-34-DYNAMICUSERMIGRATE/test.sh
+++ b/test/TEST-34-DYNAMICUSERMIGRATE/test.sh
@ -38,7 +38,7 @@ EOF
        cp testsuite.sh $initdir/

        setup_testsuite
-    ) || return 1
+    )
    setup_nspawn_root

    ddebug "umount $TESTDIR/root"