cron2 has uploaded a new patch set (#3) to the change originally created by 
mattock. ( http://gerrit.openvpn.net/c/openvpn/+/776?usp=email )

The following approvals got outdated and were removed:
Code-Review+2 by cron2


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.seppa...@gmail.com>
Acked-by: Gert Doering <g...@greenie.muc.de>
Message-Id: <20241024133220.4864-1-g...@greenie.muc.de>
URL: 
https://www.mail-archive.com/search?l=mid&q=20241024133220.4864-1-g...@greenie.muc.de
URL: https://gerrit.openvpn.net/c/openvpn/+/776
Signed-off-by: Gert Doering <g...@greenie.muc.de>
---
M tests/t_server_null.sh
M tests/t_server_null_client.sh
M tests/t_server_null_server.sh
3 files changed, 7 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/76/776/3

diff --git a/tests/t_server_null.sh b/tests/t_server_null.sh
index 7627edf..d4311d4 100755
--- a/tests/t_server_null.sh
+++ b/tests/t_server_null.sh
@@ -56,6 +56,10 @@
 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 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..f8ba3a3 100755
--- a/tests/t_server_null_server.sh
+++ b/tests/t_server_null_server.sh
@@ -4,12 +4,11 @@
     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 @@
          --writepid "${pid}" \
          --explicit-exit-notify 3
     else
-        $RUN_SUDO rm -f "${status}" "${log}" "${pid}"
         $RUN_SUDO "${server_exec}" \
                    $server_conf \
                    --status "${status}" 1 \

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/776?usp=email
To unsubscribe, or for help writing mail filters, visit 
http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I49f1e7d25edb62bf202ffceb45dedc213f2eafdd
Gerrit-Change-Number: 776
Gerrit-PatchSet: 3
Gerrit-Owner: mattock <sam...@openvpn.net>
Gerrit-Reviewer: cron2 <g...@greenie.muc.de>
Gerrit-Reviewer: flichtenheld <fr...@lichtenheld.com>
Gerrit-Reviewer: plaisthos <arne-open...@rfc2549.org>
Gerrit-CC: openvpn-devel <openvpn-devel@lists.sourceforge.net>
Gerrit-MessageType: newpatchset
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel

Reply via email to