From: "cron2 (Code Review)" Date: Thu, 20 Jun 2024 13:34:21 +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="5N/zoUCNCzM="; 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 , plaisthos , mattock Cc: openvpn-devel --5N/zoUCNCzM= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has uploaded a new patch set (#2) to the change originally created by= flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/668?usp=3Demail ) The following approvals got outdated and were removed: Code-Review+2 by mattock 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(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/68/668/2 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 =20 "${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: newpatchset --5N/zoUCNCzM= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 uploaded patch set #2 to the change originally cr= eated by flichtenheld.

View Change

The following approvals got outda= ted and were removed: Code-Review+2 by mattock

t_server_null.sh: Fix failure case

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

Change-Id: I35f7c= f84e035bc793d6f0f59e46edf1a2efe0391
Signed-off-by: Frank Lichtenheld <= ;frank@...2641...>
Acked-by: Samuli Sepp=C3=A4nen <samuli@...1699...= .>
Message-Id: <20240620103749.7923-1-gert@...1296...>
URL: = https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg28815.h= tml
Signed-off-by: Gert Doering <gert@...1296...>
---
M test= s/t_server_null.sh
M tests/t_server_null_client.sh
2 files changed, 4= insertions(+), 1 deletion(-)

git pull ssh://gerrit.openvpn.net:2=
9418/openvpn refs/changes/68/668/2
diff --git a/tests/t_server_null=
.sh b/tests/t_server_null.sh
index cfca5ee..0e53ba4 100755<= /span>
--- 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$?<= br>
# When running make jobs in parallel ("mak= e -j<x> check") we need to ensure
# that this s= cript does not exit before all --dev null servers are dead and
# their network interfaces are gone. Otherwise t_client.sh will fail b= ecause

# pre and post ifconfig output does not match.
wait
+
+exit $retvaldiff --git a/tests/t_server_null_client.sh b/tests/t_server_null_cl= ient.sh
index 5d5542b..8890007 100755
--- a= /tests/t_server_null_client.sh
+++ b/tests/t_server_null_cl= ient.sh
@@ -130,7 +130,7 @@
eval test_= name=3D\"\$TEST_NAME_$SUF\"
eval should_pass= =3D\"\$SHOULD_PASS_$SUF\"

- (get_client_test_result "${test_na= me}" "${should_pass}")
+ get_client_test_result "${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: 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: newpatchset
--5N/zoUCNCzM=--