shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-25 21:57:32 +03:00
Code

tests: fix shellcheck warnings

Browse Source
This commit is contained in:
Luca Boccassi 2023-06-05 22:48:06 +01:00 committed by Luca Boccassi
parent 06390e22c9
commit 6aea5ce814
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/hwdb-test.sh
View File

@ -28,11 +28,11 @@ cp -a "$ROOTDIR/hwdb.d" "$D/etc/udev/hwdb.d"
err=$("$SYSTEMD_HWDB" update --root "$D" 2>&1 >/dev/null) && rc= || rc=$? err=$("$SYSTEMD_HWDB" update --root "$D" 2>&1 >/dev/null) && rc= || rc=$?
if [ -n "$err" ]; then if [ -n "$err" ]; then
echo "$err" echo "$err"
exit ${rc:-1} exit "${rc:-1}"
fi fi
if [ -n "$rc" ]; then if [ -n "$rc" ]; then
echo "$SYSTEMD_HWDB returned $rc" echo "$SYSTEMD_HWDB returned $rc"
exit $rc exit "$rc"
fi fi
if [ ! -e "$D/etc/udev/hwdb.bin" ]; then if [ ! -e "$D/etc/udev/hwdb.bin" ]; then
@ -47,7 +47,7 @@ cp -a "$ROOTDIR/test/hwdb.d" "$D/etc/udev/hwdb.d"
err=$("$SYSTEMD_HWDB" update --root "$D" 2>&1 >/dev/null) && rc= || rc=$? err=$("$SYSTEMD_HWDB" update --root "$D" 2>&1 >/dev/null) && rc= || rc=$?
if [ -n "$rc" ]; then if [ -n "$rc" ]; then
echo "$SYSTEMD_HWDB returned $rc" echo "$SYSTEMD_HWDB returned $rc"
exit $rc exit "$rc"
fi fi
if [ -n "$err" ]; then if [ -n "$err" ]; then
echo "Expected warnings" echo "Expected warnings"

4
test/test-sysusers.sh.in
View File

@ -140,7 +140,7 @@ for f in $(find "$SOURCE"/test-*.input | sort -V); do
# shellcheck disable=SC2050 # shellcheck disable=SC2050
[ @ENABLE_COMPAT_MUTABLE_UID_BOUNDARIES@ = 1 ] && bound=555 || bound=$system_guid_max [ @ENABLE_COMPAT_MUTABLE_UID_BOUNDARIES@ = 1 ] && bound=555 || bound=$system_guid_max
compare "${f%.*}" "(with login.defs)" $bound compare "${f%.*}" "(with login.defs)" "$bound"
done done
rm -f "$TESTDIR"/etc/sysusers.d/* "$TESTDIR"/usr/lib/sysusers.d/* rm -f "$TESTDIR"/etc/sysusers.d/* "$TESTDIR"/usr/lib/sysusers.d/*
@ -156,7 +156,7 @@ for f in $(find "$SOURCE"/test-*.input | sort -V); do
# shellcheck disable=SC2050 # shellcheck disable=SC2050
[ @ENABLE_COMPAT_MUTABLE_UID_BOUNDARIES@ = 1 ] && bound=555 || bound=$system_guid_max [ @ENABLE_COMPAT_MUTABLE_UID_BOUNDARIES@ = 1 ] && bound=555 || bound=$system_guid_max
compare "${f%.*}" "(with login.defs symlinked)" $bound compare "${f%.*}" "(with login.defs symlinked)" "$bound"
done done
rm -f "$TESTDIR"/etc/sysusers.d/* "$TESTDIR"/usr/lib/sysusers.d/* rm -f "$TESTDIR"/etc/sysusers.d/* "$TESTDIR"/usr/lib/sysusers.d/*