[Openvpn-devel,v1] t_server_null.sh: Fix failure case

Message ID 20240620103749.7923-1-gert@greenie.muc.de
State Accepted
Headers show
Series [Openvpn-devel,v1] t_server_null.sh: Fix failure case | expand

Commit Message

Gert Doering June 20, 2024, 10:37 a.m. UTC
From: Frank Lichtenheld <frank@lichtenheld.com>

The changes for POSIX shell compatibility and parallel
make compatibility broke actually failing the test
when a subtest fails.

Change-Id: I35f7cf84e035bc793d6f0f59e46edf1a2efe0391
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Acked-by: Samuli Seppänen <samuli@openvpn.net>

This change was reviewed on Gerrit and approved by at least one
developer. I request to merge it to master.

Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/668
This mail reflects revision 1 of this Change.

Acked-by according to Gerrit (reflected above):
Samuli Seppänen <samuli@openvpn.net>


Gert Doering June 20, 2024, 1:34 p.m. UTC | #1
Yeah, obvious in hindsight :-)

Your patch has been applied to the master branch.

commit c9f29e35cd475f18c34aa96eb5fad452210404f9
Author: Frank Lichtenheld
Date:   Thu Jun 20 12:37:48 2024 +0200

     t_server_null.sh: Fix failure case

     Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
     Acked-by: Samuli Seppänen <samuli@openvpn.net>
     Message-Id: <20240620103749.7923-1-gert@greenie.muc.de>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg28815.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>

kind regards,

Gert Doering


diff --git a/tests/t_server_null.sh b/tests/t_server_null.sh
index cfca5ee..0e53ba4 100755
--- a/tests/t_server_null.sh
+++ b/tests/t_server_null.sh
@@ -64,9 +64,12 @@ 
 # 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
 # pre and post ifconfig output does not match.
+exit $retval
diff --git a/tests/t_server_null_client.sh b/tests/t_server_null_client.sh
index 5d5542b..8890007 100755
--- a/tests/t_server_null_client.sh
+++ b/tests/t_server_null_client.sh
@@ -130,7 +130,7 @@ 
     eval test_name=\"\$TEST_NAME_$SUF\"
     eval should_pass=\"\$SHOULD_PASS_$SUF\"
-    (get_client_test_result "${test_name}" "${should_pass}")
+    get_client_test_result "${test_name}" "${should_pass}"
 exit $retval