From: Alexander Barton <alex@barton.de>
Date: Sat, 13 Apr 2024 10:00:49 +0000 (+0200)
Subject: Test suite: Use $USER in getpid.sh when $LOGNAME is not set
X-Git-Tag: rel-27-rc1~1
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git;a=commitdiff_plain;h=e3f96d446dd88241a94de51b676fd118d47ab7d7

Test suite: Use $USER in getpid.sh when $LOGNAME is not set

The LOGNAME environment variable is not set in GitHub "actions", for
example ...
---

diff --git a/src/testsuite/getpid.sh b/src/testsuite/getpid.sh
index 465def64..85059142 100755
--- a/src/testsuite/getpid.sh
+++ b/src/testsuite/getpid.sh
@@ -23,7 +23,7 @@ if [ -x /usr/bin/pgrep ]; then
 		*)
 			PGREP_FLAGS=""
 	esac
-	exec /usr/bin/pgrep $PGREP_FLAGS -n -u "$LOGNAME" "$1"
+	exec /usr/bin/pgrep $PGREP_FLAGS -n -u "${LOGNAME:-$USER}" "$1"
 fi
 
 # pidof(1) could be a good alternative on elder Linux systems
diff --git a/src/testsuite/start-server.sh b/src/testsuite/start-server.sh
index 599bf3ad..bc6eb7ea 100755
--- a/src/testsuite/start-server.sh
+++ b/src/testsuite/start-server.sh
@@ -20,7 +20,7 @@ echo_n "starting server ${id} ..."
 
 # check weather getpid.sh returns valid PIDs. If not, don't start up the
 # test-server, because we won't be able to kill it at the end of the test.
-./getpid.sh sh >/dev/null 2>&1
+./getpid.sh sh >/dev/null
 if [ $? -ne 0 ]; then
 	echo " getpid.sh failed!"
 	exit 1