]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test: fix a couple of issues found by shellcheck
authorFrantisek Sumsal <frantisek@sumsal.cz>
Fri, 17 Jun 2022 13:28:17 +0000 (15:28 +0200)
committerFrantisek Sumsal <frantisek@sumsal.cz>
Fri, 17 Jun 2022 13:28:17 +0000 (15:28 +0200)
test/units/testsuite-02.sh
test/units/testsuite-38.sh

index 54927a63770af051f4561f0c755d10c29f21c732..8ebcc575ee7cab5c1fd8471a5102647f5620374a 100755 (executable)
@@ -61,7 +61,7 @@ for task in "${TEST_LIST[@]}"; do
                 # Task has finished, report its result and drop it from the queue
                 wait "${running[$key]}" && ec=0 || ec=$?
                 report_result "$key" $ec
-                unset running["$key"]
+                unset "running[$key]"
                 # Break from inner for loop and outer while loop to skip
                 # the sleep below when we find a free slot in the queue
                 break 2
@@ -85,7 +85,7 @@ for key in "${!running[@]}"; do
     echo "Waiting for test '$key' to finish"
     wait ${running[$key]} && ec=0 || ec=$?
     report_result "$key" $ec
-    unset running["$key"]
+    unset "running[$key]"
 done
 
 set -x
index 438990d1c523ea77d368f8bbbb3db472b083f22a..c5f9bcc22c8a68b95083a1e91a4a4876c727e048 100755 (executable)
@@ -17,7 +17,7 @@ dbus_freeze() {
     local name object_path suffix
 
     suffix="${1##*.}"
-    name="${1%.$suffix}"
+    name="${1%".$suffix"}"
     object_path="/org/freedesktop/systemd1/unit/${name//-/_2d}_2e${suffix}"
 
     busctl call \
@@ -31,7 +31,7 @@ dbus_thaw() {
     local name object_path suffix
 
     suffix="${1##*.}"
-    name="${1%.$suffix}"
+    name="${1%".$suffix"}"
     object_path="/org/freedesktop/systemd1/unit/${name//-/_2d}_2e${suffix}"
 
     busctl call \
@@ -65,7 +65,7 @@ dbus_can_freeze() {
     local name object_path suffix
 
     suffix="${1##*.}"
-    name="${1%.$suffix}"
+    name="${1%".$suffix"}"
     object_path="/org/freedesktop/systemd1/unit/${name//-/_2d}_2e${suffix}"
 
     busctl get-property \
@@ -79,7 +79,7 @@ check_freezer_state() {
     local name object_path suffix
 
     suffix="${1##*.}"
-    name="${1%.$suffix}"
+    name="${1%".$suffix"}"
     object_path="/org/freedesktop/systemd1/unit/${name//-/_2d}_2e${suffix}"
 
     for _ in {0..10}; do