shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-22 13:33:56 +03:00
Code

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

Browse Source 
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`).
This commit is contained in:
Frantisek Sumsal 2019-07-08 21:11:32 +02:00
parent 71a0de36e5
commit cc469c3dfc
30 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/TEST-01-BASIC/test.sh
View File

@ -29,7 +29,7 @@ Type=oneshot
EOF
setup_testsuite
) || return 1
)
setup_nspawn_root
ddebug "umount $TESTDIR/root"

2
test/TEST-02-CRYPTSETUP/test.sh
View File

@ -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

2
test/TEST-03-JOBS/test.sh
View File

@ -44,7 +44,7 @@ EOF
cp test-jobs.sh $initdir/
setup_testsuite
) || return 1
)
setup_nspawn_root
ddebug "umount $TESTDIR/root"

2
test/TEST-04-JOURNAL/test.sh
View File

@ -46,7 +46,7 @@ EOF
cp test-journal.sh $initdir/
setup_testsuite
) || return 1
)
setup_nspawn_root
ddebug "umount $TESTDIR/root"

2
test/TEST-05-RLIMITS/test.sh
View File

@ -42,7 +42,7 @@ EOF
cp test-rlimits.sh $initdir/
setup_testsuite
) || return 1
)
setup_nspawn_root
ddebug "umount $TESTDIR/root"

2
test/TEST-06-SELINUX/test.sh
View File

@ -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

2
test/TEST-07-ISSUE-1981/test.sh
View File

@ -40,7 +40,7 @@ EOF
cp test-segfault.sh $initdir/
setup_testsuite
) || return 1
)
setup_nspawn_root
ddebug "umount $TESTDIR/root"

2
test/TEST-08-ISSUE-2730/test.sh
View File

@ -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

2
test/TEST-09-ISSUE-2691/test.sh
View File

@ -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

2
test/TEST-10-ISSUE-2467/test.sh
View File

@ -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

2
test/TEST-11-ISSUE-3166/test.sh
View File

@ -64,7 +64,7 @@ EOF
chmod 0755 $initdir/test-fail-on-restart.sh
setup_testsuite
) || return 1
)
ddebug "umount $TESTDIR/root"
umount $TESTDIR/root

2
test/TEST-12-ISSUE-3171/test.sh
View File

@ -90,7 +90,7 @@ EOF
chmod 0755 $initdir/test-socket-group.sh
setup_testsuite
) || return 1
)
setup_nspawn_root

2
test/TEST-13-NSPAWN-SMOKE/test.sh
View File

@ -184,7 +184,7 @@ EOF
chmod 0755 $initdir/test-nspawn.sh
setup_testsuite
) || return 1
)
ddebug "umount $TESTDIR/root"
umount $TESTDIR/root

2
test/TEST-14-MACHINE-ID/test.sh
View File

@ -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

2
test/TEST-16-EXTEND-TIMEOUT/test.sh
View File

@ -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

2
test/TEST-17-UDEV-WANTS/test.sh
View File

@ -38,7 +38,7 @@ EOF
cp testsuite.sh $initdir/
setup_testsuite
) || return 1
)
ddebug "umount $TESTDIR/root"
umount $TESTDIR/root

2
test/TEST-18-FAILUREACTION/test.sh
View File

@ -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

2
test/TEST-19-DELEGATE/test.sh
View File

@ -40,7 +40,7 @@ EOF
cp testsuite.sh $initdir/
setup_testsuite
) || return 1
)
ddebug "umount $TESTDIR/root"
umount $TESTDIR/root

2
test/TEST-20-MAINPIDGAMES/test.sh
View File

@ -38,7 +38,7 @@ EOF
cp testsuite.sh $initdir/
setup_testsuite
) || return 1
)
setup_nspawn_root
ddebug "umount $TESTDIR/root"

2
test/TEST-23-TYPE-EXEC/test.sh
View File

@ -38,7 +38,7 @@ EOF
cp testsuite.sh $initdir/
setup_testsuite
) || return 1
)
setup_nspawn_root
ddebug "umount $TESTDIR/root"

2
test/TEST-24-UNIT-TESTS/test.sh
View File

@ -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

2
test/TEST-25-IMPORT/test.sh
View File

@ -31,7 +31,7 @@ EOF
cp testsuite.sh $initdir/
setup_testsuite
) || return 1
)
setup_nspawn_root
ddebug "umount $TESTDIR/root"

2
test/TEST-26-SETENV/test.sh
View File

@ -30,7 +30,7 @@ EOF
cp testsuite.sh $initdir/
setup_testsuite
) || return 1
)
setup_nspawn_root
ddebug "umount $TESTDIR/root"

2
test/TEST-27-STDOUTFILE/test.sh
View File

@ -40,7 +40,7 @@ EOF
cp testsuite.sh $initdir/
setup_testsuite
) || return 1
)
setup_nspawn_root
ddebug "umount $TESTDIR/root"

2
test/TEST-28-PERCENTJ-WANTEDBY/test.sh
View File

@ -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

2
test/TEST-29-UDEV-ID_RENAMING/test.sh
View File

@ -38,7 +38,7 @@ EOF
cp testsuite.sh $initdir/
setup_testsuite
) || return 1
)
ddebug "umount $TESTDIR/root"
umount $TESTDIR/root

2
test/TEST-30-ONCLOCKCHANGE/test.sh
View File

@ -49,7 +49,7 @@ EOF
cp testsuite.sh $initdir/
setup_testsuite
) || return 1
)
ddebug "umount $TESTDIR/root"
umount $TESTDIR/root

2
test/TEST-31-DEVICE-ENUMERATION/test.sh
View File

@ -38,7 +38,7 @@ EOF
cp testsuite.sh $initdir/
setup_testsuite
) || return 1
)
ddebug "umount $TESTDIR/root"
umount $TESTDIR/root

2
test/TEST-32-OOMPOLICY/test.sh
View File

@ -41,7 +41,7 @@ EOF
cp testsuite.sh $initdir/
setup_testsuite
) || return 1
)
ddebug "umount $TESTDIR/root"
umount $TESTDIR/root

2
test/TEST-34-DYNAMICUSERMIGRATE/test.sh
View File

@ -38,7 +38,7 @@ EOF
cp testsuite.sh $initdir/
setup_testsuite
) || return 1
)
setup_nspawn_root
ddebug "umount $TESTDIR/root"