diff mbox series

[Openvpn-devel,S] Change in openvpn[master]: t_server_null: persist test log files

Message ID 07bc3590c0b3cdf5100f0f5df13bb8b925adfa94-HTML@gerrit.openvpn.net
State New
Headers show
Series [Openvpn-devel,S] Change in openvpn[master]: t_server_null: persist test log files | expand

Commit Message

flichtenheld (Code Review) Oct. 4, 2024, 6:03 a.m. UTC 
Attention is currently required from: flichtenheld, plaisthos.

Hello plaisthos, flichtenheld,

I'd like you to do a code review.
Please visit

    http://gerrit.openvpn.net/c/openvpn/+/776?usp=email

to review the following change.


Change subject: t_server_null: persist test log files
......................................................................

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>
---
M tests/t_server_null.sh
M tests/t_server_null_client.sh
M tests/t_server_null_server.sh
3 files changed, 9 insertions(+), 4 deletions(-)



  git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/76/776/1
diff mbox series

Patch

diff --git a/tests/t_server_null.sh b/tests/t_server_null.sh
index 7627edf..61a9cdc 100755
--- a/tests/t_server_null.sh
+++ b/tests/t_server_null.sh
@@ -56,11 +56,16 @@ 
 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"
 retval=$?
 
+
 # When running make jobs in parallel ("make -j<x> check") we need to ensure
 # that this script does not exit before all --dev null servers are dead and
 # their network interfaces are gone. Otherwise t_client.sh will fail because
diff --git a/tests/t_server_null_client.sh b/tests/t_server_null_client.sh
index c1a25df..846f790 100755
--- a/tests/t_server_null_client.sh
+++ b/tests/t_server_null_client.sh
@@ -14,7 +14,7 @@ 
         $client_conf \
         --writepid "${pid}" \
         --setenv pid $pid \
-        --log "${log}" &
+        --log "${t_server_null_logdir}/${log}" &
 }
 
 wait_for_results() {
@@ -44,7 +44,7 @@ 
     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 10bb44b..9393b9c 100755
--- a/tests/t_server_null_server.sh
+++ b/tests/t_server_null_server.sh
@@ -13,7 +13,7 @@ 
         "${server_exec}" \
          $server_conf \
          --status "${status}" 1 \
-         --log "${log}" \
+         --log "${t_server_null_logdir}/${log}" \
          --writepid "${pid}" \
          --explicit-exit-notify 3
     else
@@ -21,7 +21,7 @@ 
         $RUN_SUDO "${server_exec}" \
                    $server_conf \
                    --status "${status}" 1 \
-                   --log "${log}" \
+                   --log "${t_server_null_logdir}/${log}" \
                    --writepid "${pid}" \
                    --explicit-exit-notify 3
     fi