shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-04 09:18:12 +03:00
Code

test: quote paths to executables

Browse Source 
Fixes #34459.
This commit is contained in:
Yu Watanabe 2024-09-18 05:00:21 +09:00
parent 6e1816ef16
commit 13f6ec7ce7
5 changed files with 46 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/test/test-compress.c
View File

@ -197,7 +197,7 @@ _unused_ static void test_compress_stream(const char *compression,
ASSERT_OK(compress(src, dst, -1, &uncompressed_size)); ASSERT_OK(compress(src, dst, -1, &uncompressed_size));
if (cat) { if (cat) {
assert_se(asprintf(&cmd, "%s %s | diff %s -", cat, pattern, srcfile) > 0); assert_se(asprintf(&cmd, "%s %s | diff '%s' -", cat, pattern, srcfile) > 0);
assert_se(system(cmd) == 0); assert_se(system(cmd) == 0);
} }
@ -212,7 +212,7 @@ _unused_ static void test_compress_stream(const char *compression,
r = decompress(dst, dst2, st.st_size); r = decompress(dst, dst2, st.st_size);
assert_se(r == 0); assert_se(r == 0);
assert_se(asprintf(&cmd2, "diff %s %s", srcfile, pattern2) > 0); assert_se(asprintf(&cmd2, "diff '%s' %s", srcfile, pattern2) > 0);
assert_se(system(cmd2) == 0); assert_se(system(cmd2) == 0);
log_debug("/* test faulty decompression */"); log_debug("/* test faulty decompression */");

3
src/udev/test-udev-spawn.c
View File

@ -52,7 +52,8 @@ static void test_event_spawn_self(const char *self, const char *arg, bool with_p
log_debug("/* %s(%s, %s) */", __func__, arg, yes_no(with_pidfd)); log_debug("/* %s(%s, %s) */", __func__, arg, yes_no(with_pidfd));
assert_se(cmd = strjoin(self, " ", arg)); /* 'self' may contain spaces, hence needs to be quoted. */
assert_se(cmd = strjoin("'", self, "' ", arg));
test_event_spawn_core(with_pidfd, cmd, result_buf, BUF_SIZE); test_event_spawn_core(with_pidfd, cmd, result_buf, BUF_SIZE);

44
test/test-compare-versions.sh
View File

@ -4,32 +4,32 @@ set -e
ANALYZE="${1:-systemd-analyze}" ANALYZE="${1:-systemd-analyze}"
$ANALYZE compare-versions 1 lt 2 "$ANALYZE" compare-versions 1 lt 2
$ANALYZE compare-versions 1 '<' 2 "$ANALYZE" compare-versions 1 '<' 2
$ANALYZE compare-versions 1 le 2 "$ANALYZE" compare-versions 1 le 2
$ANALYZE compare-versions 1 '<=' 2 "$ANALYZE" compare-versions 1 '<=' 2
$ANALYZE compare-versions 1 ne 2 "$ANALYZE" compare-versions 1 ne 2
$ANALYZE compare-versions 1 '!=' 2 "$ANALYZE" compare-versions 1 '!=' 2
( ! $ANALYZE compare-versions 1 ge 2 ) ( ! "$ANALYZE" compare-versions 1 ge 2 )
( ! $ANALYZE compare-versions 1 '>=' 2 ) ( ! "$ANALYZE" compare-versions 1 '>=' 2 )
( ! $ANALYZE compare-versions 1 eq 2 ) ( ! "$ANALYZE" compare-versions 1 eq 2 )
( ! $ANALYZE compare-versions 1 '==' 2 ) ( ! "$ANALYZE" compare-versions 1 '==' 2 )
( ! $ANALYZE compare-versions 1 gt 2 ) ( ! "$ANALYZE" compare-versions 1 gt 2 )
( ! $ANALYZE compare-versions 1 '>' 2 ) ( ! "$ANALYZE" compare-versions 1 '>' 2 )
test "$($ANALYZE compare-versions 1 2)" = '1 < 2' test "$("$ANALYZE" compare-versions 1 2)" = '1 < 2'
test "$($ANALYZE compare-versions 2 2)" = '2 == 2' test "$("$ANALYZE" compare-versions 2 2)" = '2 == 2'
test "$($ANALYZE compare-versions 2 1)" = '2 > 1' test "$("$ANALYZE" compare-versions 2 1)" = '2 > 1'
test "$($ANALYZE compare-versions '' '')" = "'' == ''" test "$("$ANALYZE" compare-versions '' '')" = "'' == ''"
set +e set +e
$ANALYZE compare-versions 1 2; ret1=$? "$ANALYZE" compare-versions 1 2; ret1=$?
$ANALYZE compare-versions 2 2; ret2=$? "$ANALYZE" compare-versions 2 2; ret2=$?
$ANALYZE compare-versions 2 1; ret3=$? "$ANALYZE" compare-versions 2 1; ret3=$?
set -e set -e
test $ret1 == 12 test "$ret1" == 12
test $ret2 == 0 test "$ret2" == 0
test $ret3 == 11 test "$ret3" == 11

4
test/test-fstab-generator.sh
View File

@ -44,9 +44,9 @@ test_one() (
fi fi
if [[ "${input##*/}" =~ \.fstab\.input ]]; then if [[ "${input##*/}" =~ \.fstab\.input ]]; then
SYSTEMD_LOG_LEVEL=debug SYSTEMD_IN_INITRD="$initrd" SYSTEMD_SYSFS_CHECK=no SYSTEMD_PROC_CMDLINE="fstab=yes root=fstab" SYSTEMD_FSTAB="$input" SYSTEMD_SYSROOT_FSTAB="/dev/null" $generator "$out" "$out" "$out" SYSTEMD_LOG_LEVEL=debug SYSTEMD_IN_INITRD="$initrd" SYSTEMD_SYSFS_CHECK=no SYSTEMD_PROC_CMDLINE="fstab=yes root=fstab" SYSTEMD_FSTAB="$input" SYSTEMD_SYSROOT_FSTAB="/dev/null" "$generator" "$out" "$out" "$out"
else else
SYSTEMD_LOG_LEVEL=debug SYSTEMD_IN_INITRD="$initrd" SYSTEMD_SYSFS_CHECK=no SYSTEMD_PROC_CMDLINE="fstab=no $(cat "$input")" $generator "$out" "$out" "$out" SYSTEMD_LOG_LEVEL=debug SYSTEMD_IN_INITRD="$initrd" SYSTEMD_SYSFS_CHECK=no SYSTEMD_PROC_CMDLINE="fstab=no $(cat "$input")" "$generator" "$out" "$out" "$out"
fi fi
# The option x-systemd.growfs creates symlink to system's systemd-growfs@.service in .mount.wants directory. # The option x-systemd.growfs creates symlink to system's systemd-growfs@.service in .mount.wants directory.

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

@ -53,7 +53,7 @@ for f in $(find "$SOURCE"/test-*.input | sort -V); do
echo "*** Running $f" echo "*** Running $f"
prepare_testdir "${f%.input}" prepare_testdir "${f%.input}"
cp "$f" "$TESTDIR/usr/lib/sysusers.d/test.conf" cp "$f" "$TESTDIR/usr/lib/sysusers.d/test.conf"
$SYSUSERS --root="$TESTDIR" "$SYSUSERS" --root="$TESTDIR"
compare "${f%.*}" "" compare "${f%.*}" ""
done done
@ -62,7 +62,7 @@ for f in $(find "$SOURCE"/test-*.input | sort -V); do
echo "*** Running $f on stdin" echo "*** Running $f on stdin"
prepare_testdir "${f%.input}" prepare_testdir "${f%.input}"
touch "$TESTDIR/etc/sysusers.d/test.conf" touch "$TESTDIR/etc/sysusers.d/test.conf"
$SYSUSERS --root="$TESTDIR" - <"$f" "$SYSUSERS" --root="$TESTDIR" - <"$f"
compare "${f%.*}" "on stdin" compare "${f%.*}" "on stdin"
done done
@ -72,9 +72,9 @@ for f in $(find "$SOURCE"/test-*.input | sort -V); do
prepare_testdir "${f%.input}" prepare_testdir "${f%.input}"
touch "$TESTDIR/etc/sysusers.d/test.conf" touch "$TESTDIR/etc/sysusers.d/test.conf"
# this overrides test.conf which is masked on disk # this overrides test.conf which is masked on disk
$SYSUSERS --root="$TESTDIR" --replace=/etc/sysusers.d/test.conf - <"$f" "$SYSUSERS" --root="$TESTDIR" --replace=/etc/sysusers.d/test.conf - <"$f"
# this should be ignored # this should be ignored
$SYSUSERS --root="$TESTDIR" --replace=/usr/lib/sysusers.d/test.conf - <"$SOURCE/test-1.input" "$SYSUSERS" --root="$TESTDIR" --replace=/usr/lib/sysusers.d/test.conf - <"$SOURCE/test-1.input"
compare "${f%.*}" "on stdin with --replace" compare "${f%.*}" "on stdin with --replace"
done done
@ -84,7 +84,7 @@ echo "*** Testing --inline"
prepare_testdir "$SOURCE/inline" prepare_testdir "$SOURCE/inline"
# copy a random file to make sure it is ignored # copy a random file to make sure it is ignored
cp "$f" "$TESTDIR/etc/sysusers.d/confuse.conf" cp "$f" "$TESTDIR/etc/sysusers.d/confuse.conf"
$SYSUSERS --root="$TESTDIR" --inline \ "$SYSUSERS" --root="$TESTDIR" --inline \
"u u1 222 - - /bin/zsh" \ "u u1 222 - - /bin/zsh" \
"g g1 111" "g g1 111"
@ -95,7 +95,7 @@ echo "*** Testing --inline with --replace"
prepare_testdir "$SOURCE/inline" prepare_testdir "$SOURCE/inline"
# copy a random file to make sure it is ignored # copy a random file to make sure it is ignored
cp "$f" "$TESTDIR/etc/sysusers.d/confuse.conf" cp "$f" "$TESTDIR/etc/sysusers.d/confuse.conf"
$SYSUSERS --root="$TESTDIR" \ "$SYSUSERS" --root="$TESTDIR" \
--inline \ --inline \
--replace=/etc/sysusers.d/confuse.conf \ --replace=/etc/sysusers.d/confuse.conf \
"u u1 222 - - /bin/zsh" \ "u u1 222 - - /bin/zsh" \
@ -105,7 +105,7 @@ compare "$SOURCE/inline" "(--inline --replace=…)"
echo "*** Testing --inline with no /etc" echo "*** Testing --inline with no /etc"
rm -rf "${TESTDIR:?}/etc" rm -rf "${TESTDIR:?}/etc"
$SYSUSERS --root="$TESTDIR" --inline \ "$SYSUSERS" --root="$TESTDIR" --inline \
"u u1 222 - - /bin/zsh" \ "u u1 222 - - /bin/zsh" \
"g g1 111" "g g1 111"
@ -136,7 +136,7 @@ for f in $(find "$SOURCE"/test-*.input | sort -V); do
echo "*** Running $f (with login.defs)" echo "*** Running $f (with login.defs)"
prepare_testdir "${f%.input}" prepare_testdir "${f%.input}"
cp "$f" "$TESTDIR/usr/lib/sysusers.d/test.conf" cp "$f" "$TESTDIR/usr/lib/sysusers.d/test.conf"
$SYSUSERS --root="$TESTDIR" "$SYSUSERS" --root="$TESTDIR"
# 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
@ -152,7 +152,7 @@ for f in $(find "$SOURCE"/test-*.input | sort -V); do
echo "*** Running $f (with login.defs symlinked)" echo "*** Running $f (with login.defs symlinked)"
prepare_testdir "${f%.input}" prepare_testdir "${f%.input}"
cp "$f" "$TESTDIR/usr/lib/sysusers.d/test.conf" cp "$f" "$TESTDIR/usr/lib/sysusers.d/test.conf"
$SYSUSERS --root="$TESTDIR" "$SYSUSERS" --root="$TESTDIR"
# 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
@ -166,7 +166,7 @@ for f in $(find "$SOURCE"/unhappy-*.input | sort -V); do
echo "*** Running test $f" echo "*** Running test $f"
prepare_testdir "${f%.input}" prepare_testdir "${f%.input}"
cp "$f" "$TESTDIR/usr/lib/sysusers.d/test.conf" cp "$f" "$TESTDIR/usr/lib/sysusers.d/test.conf"
SYSTEMD_LOG_LEVEL=info $SYSUSERS --root="$TESTDIR" 2>&1 | tail -n1 | sed -r 's/^[^:]+:[^:]+://' >"$TESTDIR/err" SYSTEMD_LOG_LEVEL=info "$SYSUSERS" --root="$TESTDIR" 2>&1 | tail -n1 | sed -r 's/^[^:]+:[^:]+://' >"$TESTDIR/err"
if ! diff -u "$TESTDIR/err" "${f%.*}.expected-err"; then if ! diff -u "$TESTDIR/err" "${f%.*}.expected-err"; then
echo >&2 "**** Unexpected error output for $f" echo >&2 "**** Unexpected error output for $f"
cat >&2 "$TESTDIR/err" cat >&2 "$TESTDIR/err"