From: Frantisek Sumsal Date: Fri, 9 Apr 2021 17:54:42 +0000 (+0200) Subject: test: replace the obsolete `` syntax with $() X-Git-Tag: v249-rc1~417^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ea539ad297506868835eb00affedf3f4d8010f2c;p=thirdparty%2Fsystemd.git test: replace the obsolete `` syntax with $() --- diff --git a/test/units/testsuite-04.sh b/test/units/testsuite-04.sh index 52a105d3d46..da5f9ee2af1 100755 --- a/test/units/testsuite-04.sh +++ b/test/units/testsuite-04.sh @@ -54,7 +54,7 @@ ID=$(journalctl --new-id128 | sed -n 2p) printf $'foo' | systemd-cat -t "$ID" --level-prefix false journalctl --sync journalctl -b -o export --output-fields=MESSAGE,FOO --output-fields=PRIORITY,MESSAGE -t "$ID" >/output -[[ `grep -c . /output` -eq 6 ]] +[[ $(grep -c . /output) -eq 6 ]] grep -q '^__CURSOR=' /output grep -q '^MESSAGE=foo$' /output grep -q '^PRIORITY=6$' /output @@ -82,7 +82,7 @@ journalctl --sync # We can drop this grep when https://github.com/systemd/systemd/issues/13937 # has a fix. journalctl -b -o export -t "$ID" --output-fields=_PID | grep '^_PID=' >/output -[[ `grep -c . /output` -eq 2 ]] +[[ $(grep -c . /output) -eq 2 ]] grep -q "^_PID=$PID" /output grep -vq "^_PID=$PID" /output diff --git a/test/units/testsuite-20.sh b/test/units/testsuite-20.sh index 111713dabf1..7876a9d10c3 100755 --- a/test/units/testsuite-20.sh +++ b/test/units/testsuite-20.sh @@ -5,7 +5,7 @@ set -o pipefail systemd-analyze log-level debug systemd-analyze log-target console -test `systemctl show -P MainPID testsuite-20.service` -eq $$ +test "$(systemctl show -P MainPID testsuite-20.service)" -eq $$ # Start a test process inside of our own cgroup sleep infinity & @@ -14,45 +14,45 @@ disown # Start a test process outside of our own cgroup systemd-run -p DynamicUser=1 --unit=test20-sleep.service /bin/sleep infinity -EXTERNALPID=`systemctl show -P MainPID test20-sleep.service` +EXTERNALPID="$(systemctl show -P MainPID test20-sleep.service)" # Update our own main PID to the external test PID, this should work -systemd-notify MAINPID=$EXTERNALPID -test `systemctl show -P MainPID testsuite-20.service` -eq $EXTERNALPID +systemd-notify MAINPID="$EXTERNALPID" +test "$(systemctl show -P MainPID testsuite-20.service)" -eq "$EXTERNALPID" # Update our own main PID to the internal test PID, this should work, too systemd-notify MAINPID=$INTERNALPID -test `systemctl show -P MainPID testsuite-20.service` -eq $INTERNALPID +test "$(systemctl show -P MainPID testsuite-20.service)" -eq "$INTERNALPID" # Update it back to our own PID, this should also work systemd-notify MAINPID=$$ -test `systemctl show -P MainPID testsuite-20.service` -eq $$ +test "$(systemctl show -P MainPID testsuite-20.service)" -eq $$ # Try to set it to PID 1, which it should ignore, because that's the manager systemd-notify MAINPID=1 -test `systemctl show -P MainPID testsuite-20.service` -eq $$ +test "$(systemctl show -P MainPID testsuite-20.service)" -eq $$ # Try to set it to PID 0, which is invalid and should be ignored systemd-notify MAINPID=0 -test `systemctl show -P MainPID testsuite-20.service` -eq $$ +test "$(systemctl show -P MainPID testsuite-20.service)" -eq $$ # Try to set it to a valid but non-existing PID, which should be ignored. (Note # that we set the PID to a value well above any known /proc/sys/kernel/pid_max, # which means we can be pretty sure it doesn't exist by coincidence) systemd-notify MAINPID=1073741824 -test `systemctl show -P MainPID testsuite-20.service` -eq $$ +test "$(systemctl show -P MainPID testsuite-20.service)" -eq $$ # Change it again to the external PID, without privileges this time. This should be ignored, because the PID is from outside of our cgroup and we lack privileges. -systemd-notify --uid=1000 MAINPID=$EXTERNALPID -test `systemctl show -P MainPID testsuite-20.service` -eq $$ +systemd-notify --uid=1000 MAINPID="$EXTERNALPID" +test "$(systemctl show -P MainPID testsuite-20.service)" -eq $$ # Change it again to the internal PID, without privileges this time. This should work, as the process is on our cgroup, and that's enough even if we lack privileges. -systemd-notify --uid=1000 MAINPID=$INTERNALPID -test `systemctl show -P MainPID testsuite-20.service` -eq $INTERNALPID +systemd-notify --uid=1000 MAINPID="$INTERNALPID" +test "$(systemctl show -P MainPID testsuite-20.service)" -eq "$INTERNALPID" # Update it back to our own PID, this should also work systemd-notify --uid=1000 MAINPID=$$ -test `systemctl show -P MainPID testsuite-20.service` -eq $$ +test "$(systemctl show -P MainPID testsuite-20.service)" -eq $$ cat >/tmp/test20-mainpid.sh </tmp/test20-mainpid2.sh </dev/shm/test20-mainpid3.sh </proc/sysrq-trigger while : ; do - STATE=`systemctl show -P ActiveState oomtest.service` + STATE="$(systemctl show -P ActiveState oomtest.service)" [ "$STATE" = "failed" ] && break sleep .5 done - RESULT=`systemctl show -P Result oomtest.service` + RESULT="$(systemctl show -P Result oomtest.service)" test "$RESULT" = "oom-kill" systemd-analyze log-level info