From: "cron2 (Code Review)"
Date: Wed, 3 Apr 2024 07:41:28 +0000
In-Reply-To:
References:
Reply-To: gert@...1296..., arne-openvpn@...1227...,
openvpn-devel@lists.sourceforge.net, frank@...2641...
Message-ID: <75b80901675f8961270d1b9ef14acbe3a7302525-HTML@...2715...>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Disposition: inline
Content-Type: multipart/alternative; boundary="zGkg7nTgpz0="; charset=UTF-8
Subject: [Openvpn-devel] [XS] Change in openvpn[master]: forked-test-driver:
Show test output always
List-Id:
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
To: flichtenheld
Cc: plaisthos , openvpn-devel
--zGkg7nTgpz0=
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/47=
9?usp=3Demail )
Change subject: forked-test-driver: Show test output always
......................................................................
forked-test-driver: Show test output always
We want to see the progress, at least for slow tests
like t_client.sh.
Change-Id: I11e0091482d9acee89ca018374cb8d96d22f8514
Signed-off-by: Frank Lichtenheld
Acked-by: Arne Schwabe
Message-Id: <20240125110122.16257-1-frank@...2641...>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg28=
133.html
Signed-off-by: Gert Doering
---
M forked-test-driver
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/forked-test-driver b/forked-test-driver
index be73b80..6971dfb 100755
--- a/forked-test-driver
+++ b/forked-test-driver
@@ -108,9 +108,14 @@
# Test script is run here. We create the file first, then append to it,
# to ameliorate tests themselves also writing to the log file. Our tests
# don't, but others can (automake bug#35762).
+# OVPN changes:
+# - add tee to see output of tests
+# - needs portable pipefail mechanism
+estatusfile=3D"${trs_file}.exit"
: >"$log_file"
-"$@" >>"$log_file" 2>&1
-estatus=3D$?
+("$@" 2>&1; estatus=3D$?; echo $estatus >"$estatusfile") | tee -a "$log_fi=
le"
+estatus=3D$(cat "$estatusfile")
+rm -f "$estatusfile"
if test $enable_hard_errors =3D no && test $estatus -eq 99; then
tweaked_estatus=3D1
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/479?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: I11e0091482d9acee89ca018374cb8d96d22f8514
Gerrit-Change-Number: 479
Gerrit-PatchSet: 12
Gerrit-Owner: flichtenheld
Gerrit-Reviewer: plaisthos
Gerrit-CC: openvpn-devel
Gerrit-MessageType: merged
--zGkg7nTgpz0=
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
We want to see the progress, at least for slow tests like t_client.=
sh.
Change-Id: I11e0091482d9acee89ca018374cb8d96d22f8514 Signed-o=
ff-by: Frank Lichtenheld <frank@...2641...> Acked-by: Arne Schwabe=
<arne-openvpn@...1227...> Message-Id: <20240125110122.16257-1-=
frank@...2641...> URL: https://www.mail-archive.com/openvpn-devel@...1484...=
ts.sourceforge.net/msg28133.html Signed-off-by: Gert Doering <gert@...1186...=
.1296...> --- M forked-test-driver 1 file changed, 7 insertions=
(+), 2 deletions(-)
diff --git a/forked-test-driver b/forked-test-driver ind=
ex be73b80..6971dfb 100755 --- a/forked-test-driver<=
br>+++ b/forked-test-driver @@ -108,9 +108,14 @@ # Test script is run here. We create the file first, then appe=
nd to it, # to ameliorate tests themselves also writing to=
the log file. Our tests # don't, but others can (auto=
make bug#35762). +# O=
VPN changes: +# - ad=
d tee to see output of tests +# - needs portable pipefail mechanism +estatusfile=3D"${trs_file}.exit" : >"$log_file" -"$@" >>"$log_file" 2>&1=
-estatus=3D$?+("$@" 2>&1;=
estatus=3D$?; echo $estatus >"$estatusfile") | tee -a "$=
log_file" +estat=
us=3D$(cat "$estatusfile") +rm -f "$estatusfile" if test $enable_hard_errors =3D no && test $estatus -eq 99;=
then tweaked_estatus=3D1
To view, visit change 479. To unsubscribe, or for help writing mail filter=
s, visit settings.