From: "cron2 (Code Review)" Date: Thu, 20 Jun 2024 13:34:24 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., samuli@...515..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="RKd17fzi+GY="; charset=UTF-8 Subject: [Openvpn-devel] [XS] Change in openvpn[master]: t_server_null.sh: Fix failure case List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld Cc: mattock , plaisthos , openvpn-devel --RKd17fzi+GY= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/66= 8?usp=3Demail ) Change subject: t_server_null.sh: Fix failure case ...................................................................... t_server_null.sh: Fix failure case 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 Acked-by: Samuli Sepp=C3=A4nen Message-Id: <20240620103749.7923-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg28= 815.html Signed-off-by: Gert Doering --- M tests/t_server_null.sh M tests/t_server_null_client.sh 2 files changed, 4 insertions(+), 1 deletion(-) 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 @@ fi "${srcdir}/t_server_null_client.sh" +retval=3D$? # When running make jobs in parallel ("make -j 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 becau= se # pre and post ifconfig output does not match. wait + +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=3D\"\$TEST_NAME_$SUF\" eval should_pass=3D\"\$SHOULD_PASS_$SUF\" - (get_client_test_result "${test_name}" "${should_pass}") + get_client_test_result "${test_name}" "${should_pass}" done exit $retval -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/668?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I35f7cf84e035bc793d6f0f59e46edf1a2efe0391 Gerrit-Change-Number: 668 Gerrit-PatchSet: 2 Gerrit-Owner: flichtenheld Gerrit-Reviewer: mattock Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-MessageType: merged --RKd17fzi+GY= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 submitted this change.

View Change

t_server_null.sh: Fix failure case

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

Change-Id: I3= 5f7cf84e035bc793d6f0f59e46edf1a2efe0391
Signed-off-by: Frank Lichtenheld= <frank@...2641...>
Acked-by: Samuli Sepp=C3=A4nen <samuli@...1696...= 15...>
Message-Id: <20240620103749.7923-1-gert@...1296...>
U= RL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg288= 15.html
Signed-off-by: Gert Doering <gert@...1296...>
---
M = tests/t_server_null.sh
M tests/t_server_null_client.sh
2 files change= d, 4 insertions(+), 1 deletion(-)

diff --git a/tests/t_server_null.sh b/tests/t_server_null.sh
<= span>index cfca5ee..0e53ba4 100755
--- a/tests/t_server_nul= l.sh
+++ b/tests/t_server_null.sh
@@ -64,9 = +64,12 @@
fi

"${sr= cdir}/t_server_null_client.sh"
+retval=3D$?

# When runni= ng make jobs in parallel ("make -j<x> check") we need to en= sure
# that this script does not exit before all --dev nul= l servers are dead and
# their network interfaces are gone= . Otherwise t_client.sh will fail because
# pre and post i= fconfig output does not match.
wait
+
+exit $retval
diff --git a/tests/t_server_nul= l_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=3D\"\$TEST_NAME_$SUF\"
eval should_pass=3D\"\$SHOULD_PASS_$SUF\"


- (ge= t_client_test_result "${test_name}" "${should_pass}")
+ get_client_test_r= esult "${test_name}" "${should_pass}"
= done

exit $retval

To view, visit change 668. To unsubscribe, or for help writing mai= l filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I35f7cf84e035bc793d6f0f59e46= edf1a2efe0391
Gerrit-Change-Number: 668
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: mattock <samuli@...515...&= gt;
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-MessageType: merged
--RKd17fzi+GY=--