git » chasquid » commit 77328b8

test: Remove unnecessary "exit" calls

author Alberto Bertogli
2023-02-01 23:45:51 UTC
committer Alberto Bertogli
2023-02-01 23:45:51 UTC
parent 7d6a59ba77bce90e7bdaf6746feca5772c805195

test: Remove unnecessary "exit" calls

test/t-02-exim/run.sh +0 -1
test/t-11-dovecot/run.sh +0 -1
test/t-15-driusan_dkim/run.sh +0 -1
test/t-16-spf/run.sh +2 -2
test/t-18-haproxy/run.sh +0 -1

diff --git a/test/t-02-exim/run.sh b/test/t-02-exim/run.sh
index 28dbadc..314c5d9 100755
--- a/test/t-02-exim/run.sh
+++ b/test/t-02-exim/run.sh
@@ -30,7 +30,6 @@ check_hostaliases
 
 if ! .exim4/exim4 --version > /dev/null; then
 	skip "exim4 binary at .exim4/exim4 is not functional"
-	exit 0
 fi
 
 # Create a temporary directory for exim4 to use, and generate the exim4
diff --git a/test/t-11-dovecot/run.sh b/test/t-11-dovecot/run.sh
index 8f3d8d7..22de6d9 100755
--- a/test/t-11-dovecot/run.sh
+++ b/test/t-11-dovecot/run.sh
@@ -14,7 +14,6 @@ check_hostaliases
 
 if ! dovecot --version > /dev/null; then
 	skip "dovecot not installed"
-	exit 0
 fi
 
 # Create a temporary directory for dovecot to use, and generate the dovecot
diff --git a/test/t-15-driusan_dkim/run.sh b/test/t-15-driusan_dkim/run.sh
index 45958c1..0c23eb7 100755
--- a/test/t-15-driusan_dkim/run.sh
+++ b/test/t-15-driusan_dkim/run.sh
@@ -12,7 +12,6 @@ check_hostaliases
 for binary in dkimsign dkimverify dkimkeygen; do
 	if ! command -v $binary > /dev/null; then
 		skip "$binary binary not found"
-		exit 0
 	fi
 done
 
diff --git a/test/t-16-spf/run.sh b/test/t-16-spf/run.sh
index 3eafbe0..6a93d43 100755
--- a/test/t-16-spf/run.sh
+++ b/test/t-16-spf/run.sh
@@ -44,8 +44,8 @@ wait_until_ready 2025
 
 function launch_minidns() {
 	if [ "$MINIDNS" != "" ]; then
-		kill $MINIDNS
-		wait $MINIDNS || true
+		kill "$MINIDNS"
+		wait "$MINIDNS" || true
 	fi
 	cp "$1" .zones
 	minidns_bg --addr=":9053" -zones=.zones >> .minidns.log 2>&1
diff --git a/test/t-18-haproxy/run.sh b/test/t-18-haproxy/run.sh
index 88e3884..324e572 100755
--- a/test/t-18-haproxy/run.sh
+++ b/test/t-18-haproxy/run.sh
@@ -10,7 +10,6 @@ mkdir -p .logs
 
 if ! haproxy -v > /dev/null; then
 	skip "haproxy binary not found"
-	exit 0
 fi
 
 # Set a 2m timeout: if there are issues with haproxy, the wait tends to hang