From: Samuli Seppänen <samuli.seppanen@gmail.com>
Date: Thu, 24 Oct 2024 13:32:17 +0000 (+0200)
Subject: t_server_null: persist test log files
X-Git-Tag: v2.7_alpha1~171
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3a4844a3c558eeba31f45b5a4ddcdd8b76ab897;p=thirdparty%2Fopenvpn.git

t_server_null: persist test log files

The goal is to help debug issues with t_server_null. The immediate goal
is to be able to debug server startup issues encountered on some of the
*BSD platforms.

Change-Id: I49f1e7d25edb62bf202ffceb45dedc213f2eafdd
Signed-off-by: Samuli Seppänen <samuli.seppanen@gmail.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <20241024133220.4864-1-gert@greenie.muc.de>
URL: https://www.mail-archive.com/search?l=mid&q=20241024133220.4864-1-gert@greenie.muc.de
URL: https://gerrit.openvpn.net/c/openvpn/+/776
Signed-off-by: Gert Doering <gert@greenie.muc.de>
---

diff --git a/tests/t_server_null.sh b/tests/t_server_null.sh
index 7627edf60..d4311d4ed 100755
--- a/tests/t_server_null.sh
+++ b/tests/t_server_null.sh
@@ -56,6 +56,10 @@ else
 fi
 
 srcdir="${srcdir:-.}"
+export t_server_null_logdir=t_server_null-`hostname`-`date +%Y%m%d-%H%M%S`
+
+# Create directory for server and client logs
+mkdir $t_server_null_logdir
 
 "${srcdir}/t_server_null_server.sh" &
 "${srcdir}/t_server_null_client.sh"
diff --git a/tests/t_server_null_client.sh b/tests/t_server_null_client.sh
index c1a25dfc5..846f79067 100755
--- a/tests/t_server_null_client.sh
+++ b/tests/t_server_null_client.sh
@@ -14,7 +14,7 @@ launch_client() {
         $client_conf \
         --writepid "${pid}" \
         --setenv pid $pid \
-        --log "${log}" &
+        --log "${t_server_null_logdir}/${log}" &
 }
 
 wait_for_results() {
@@ -44,7 +44,7 @@ get_client_test_result() {
     should_pass=$2
     log="${test_name}.log"
 
-    grep "Initialization Sequence Completed" "${log}" > /dev/null
+    grep "Initialization Sequence Completed" "${t_server_null_logdir}/${log}" > /dev/null
     exit_code=$?
 
     if [ $exit_code -eq 0 ] && [ "${should_pass}" = "yes" ]; then
diff --git a/tests/t_server_null_server.sh b/tests/t_server_null_server.sh
index 10bb44bfd..f8ba3a3c9 100755
--- a/tests/t_server_null_server.sh
+++ b/tests/t_server_null_server.sh
@@ -4,12 +4,11 @@ launch_server() {
     server_name=$1
     server_exec=$2
     server_conf=$3
-    log="${server_name}.log"
+    log="${t_server_null_logdir}/${server_name}.log"
     status="${server_name}.status"
     pid="${server_name}.pid"
 
     if [ -z "${RUN_SUDO}" ]; then
-        rm -f "${status}" "${log}" "${pid}"
         "${server_exec}" \
          $server_conf \
          --status "${status}" 1 \
@@ -17,7 +16,6 @@ launch_server() {
          --writepid "${pid}" \
          --explicit-exit-notify 3
     else
-        $RUN_SUDO rm -f "${status}" "${log}" "${pid}"
         $RUN_SUDO "${server_exec}" \
                    $server_conf \
                    --status "${status}" 1 \