From: "flichtenheld (Code Review)" Date: Wed, 19 Jun 2024 16:28:04 +0000 References: Reply-To: frank@...2641..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net Message-ID: <6bd4026e966b54c38e0a5c2cc960caa65ffdb9e6-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="pxqE3PPVYBY="; 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: plaisthos Cc: openvpn-devel --pxqE3PPVYBY= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: plaisthos. Hello plaisthos, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/668?usp=3Demail to review the following change. 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 --- M tests/t_server_null.sh M tests/t_server_null_client.sh 2 files changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/68/668/1 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: 1 Gerrit-Owner: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-MessageType: newchange --pxqE3PPVYBY= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: plaisthos.

flichtenheld would like plaisthos to review this change.

Vi= ew Change

t_server_null.sh: Fix failure case

The changes for POS= IX shell compatibility and parallel
make compatibility broke actually fa= iling the test
when a subtest fails.

Change-Id: I35f7cf84e035bc79= 3d6f0f59e46edf1a2efe0391
Signed-off-by: Frank Lichtenheld <frank@...1665...= 641...>
---
M tests/t_server_null.sh
M tests/t_server_null_clie= nt.sh
2 files changed, 4 insertions(+), 1 deletion(-)

git pull=
 ssh://gerrit.openvpn.net:29418/openvpn refs/changes/68/668/1
diff =
--git a/tests/t_server_null.sh b/tests/t_server_null.sh
ind= ex 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<x> check") we need to ensure
# that this script does not exit before all --dev null server= s are dead and
# their network interfaces are gone. Otherw= ise t_client.sh will fail because
# 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 1= 00755
--- 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 &qu= ot;${test_name}" "${should_pass}"
done

exit $retval

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

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I35f7cf84e035bc793d6f0f59e46= edf1a2efe0391
Gerrit-Change-Number: 668
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
Gerrit-MessageType: newchange
--pxqE3PPVYBY=--