From 5a4cb74493842e4affab258a619fe82965c88fc5 Mon Sep 17 00:00:00 2001
From: Jacques de Laval <jacques@de-laval.se>
Date: Thu, 18 Feb 2021 21:29:51 +0100
Subject: [PATCH] test: Fix shellcheck warnings

Signed-off-by: Jacques de Laval <jacques@de-laval.se>
---
 test/Makefile                           | 4 ++--
 test/runtest.sh                         | 5 +++--
 test/test_start_stop_service/service.sh | 2 +-
 test/test_start_stop_service/test.sh    | 8 ++++----
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/test/Makefile b/test/Makefile
index d343fbc2..668a7438 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -75,8 +75,8 @@ $(libs): $@
 $(libs64): $@
 	cp $(shell ldd $(finit_bin) | cut -d' ' -f3 | grep $(notdir $@)) $@
 
-.PHONY: lint
-lint:
+.PHONY: test-check
+test-check:
 	shellcheck $(shell find . -name '*.sh')
 
 .PHONY: clean
diff --git a/test/runtest.sh b/test/runtest.sh
index b43f7ff0..75094567 100755
--- a/test/runtest.sh
+++ b/test/runtest.sh
@@ -51,7 +51,7 @@ log "$color_reset" '--' ''
 # Setup
 ./testenv_start.sh finit &
 finit_ppid=$!
-for i in $(seq 1 50); do
+for _ in $(seq 1 50); do
     sleep 0.1
     pgrep -P "$finit_ppid" > /dev/null || continue
     break
@@ -60,4 +60,5 @@ done
 texec cat /dev/tty0 &
 sleep 1
 
-. "$1"
+# shellcheck source=/dev/null
+. "$TEST"
diff --git a/test/test_start_stop_service/service.sh b/test/test_start_stop_service/service.sh
index e4ae0ede..6b267e7f 100755
--- a/test/test_start_stop_service/service.sh
+++ b/test/test_start_stop_service/service.sh
@@ -2,6 +2,6 @@
 
 set -eu
 
-while [ 1 ]; do
+while true; do
   sleep 5
 done
diff --git a/test/test_start_stop_service/test.sh b/test/test_start_stop_service/test.sh
index 2d6b5810..ffe6f465 100755
--- a/test/test_start_stop_service/test.sh
+++ b/test/test_start_stop_service/test.sh
@@ -11,8 +11,8 @@ say 'Reload Finit'
 texec kill -SIGHUP 1
 sleep 1
 
-service_pids=( $(texec pgrep -P 1) )
-assert 'One service is running' ${#service_pids[@]} -eq 1
+service_pids=$(texec pgrep -P 1 | wc -l)
+assert 'One service is running' "$service_pids" -eq 1
 
 say 'Remove the service'
 texec sh -c 'echo > /etc/finit.conf'
@@ -21,8 +21,8 @@ say 'Reload Finit'
 texec kill -SIGHUP 1
 sleep 1
 
-service_pids=( $(texec pgrep -P 1) )
-assert 'Zero services are running' ${#service_pids[@]} -eq 0
+service_pids=$(texec pgrep -P 1 | wc -l)
+assert 'Zero services are running' "$service_pids" -eq 0
 
 # Teardown
 rm -f test_root/bin/service.sh