Skip to contentSkip to conversation

Change in openvpn[master]: t_server_null.sh: Fix failure case

Openvpn-devel In review flichtenheld (Code Review) 2 participants 6 messages Jun 19, 2024 – Jun 20, 2024 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): gerrit.1718814483000.I35f7cf84e035bc793d6f0f59e46edf1a2efe0391@...2715...

#1 lore raw

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=email

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

---
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

tests/t_server_null.sh +3 -0
index cfca5ee..0e53ba4 100755
@@ -64,9 +64,12 @@
 fi
 
 "${srcdir}/t_server_null_client.sh"
+retval=$?
 
 # 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.
 wait
+
+exit $retval
tests/t_server_null_client.sh +1 -1
index 5d5542b..8890007 100755
@@ -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}"
 done
 
 exit $retval

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/668?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: I35f7cf84e035bc793d6f0f59e46edf1a2efe0391
Gerrit-Change-Number: 668
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-MessageType: newchange

#2 lore raw
In reply to a message not in the archive

Attention is currently required from: flichtenheld, plaisthos.

mattock has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/668?usp=email )

Change subject: t_server_null.sh: Fix failure case
......................................................................

Patch Set 1: Code-Review+2

(1 comment)

Patchset:

PS1:
This looks good to me. I'll test this along with the other changes requested by cron2 on #openvpn-devel.

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/668?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: I35f7cf84e035bc793d6f0f59e46edf1a2efe0391
Gerrit-Change-Number: 668
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: mattock <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Thu, 20 Jun 2024 06:56:27 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

#3 lore raw

PATCH 1/1 t_server_null.sh: Fix failure case

In reply to a message not in the archive

From: Frank Lichtenheld <[email protected]...>

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

Change-Id I35f7cf84e035bc793d6f0f59e46edf1a2efe0391

---

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 <[email protected]...>

tests/t_server_null.sh +3 -0
index cfca5ee..0e53ba4 100755
@@ -64,9 +64,12 @@
 fi
 
 "${srcdir}/t_server_null_client.sh"
+retval=$?
 
 # 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.
 wait
+
+exit $retval
tests/t_server_null_client.sh +1 -1
index 5d5542b..8890007 100755
@@ -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}"
 done
 
 exit $retval
#4 lore raw

[Openvpn-devel] [PATCH applied] Re: t_server_null.sh: Fix failure case

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 <[email protected]...>
     Acked-by: Samuli Seppänen <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg28815.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering

#5 lore raw
In reply to a message not in the archive

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

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

Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28815.html

---
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

tests/t_server_null.sh +3 -0
index cfca5ee..0e53ba4 100755
@@ -64,9 +64,12 @@
 fi
 
 "${srcdir}/t_server_null_client.sh"
+retval=$?
 
 # 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.
 wait
+
+exit $retval
tests/t_server_null_client.sh +1 -1
index 5d5542b..8890007 100755
@@ -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}"
 done
 
 exit $retval

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/668?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: I35f7cf84e035bc793d6f0f59e46edf1a2efe0391
Gerrit-Change-Number: 668
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: mattock <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: newpatchset

#6 lore raw
In reply to a message not in the archive

cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/668?usp=email )

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

Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28815.html

---
M tests/t_server_null.sh
M tests/t_server_null_client.sh

2 files changed, 4 insertions(+), 1 deletion(-)
tests/t_server_null.sh +3 -0
index cfca5ee..0e53ba4 100755
@@ -64,9 +64,12 @@
 fi
 
 "${srcdir}/t_server_null_client.sh"
+retval=$?
 
 # 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.
 wait
+
+exit $retval
tests/t_server_null_client.sh +1 -1
index 5d5542b..8890007 100755
@@ -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}"
 done
 
 exit $retval

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/668?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: I35f7cf84e035bc793d6f0f59e46edf1a2efe0391
Gerrit-Change-Number: 668
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: mattock <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: merged