From e2ff9161e1b1b3e8c83bf01e3c488e0601834c0c Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Thu, 25 Jan 2024 12:01:22 +0100 Subject: [PATCH] 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@lichtenheld.com> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg28133.html Signed-off-by: Gert Doering --- forked-test-driver | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/forked-test-driver b/forked-test-driver index be73b80a..6971dfb3 100755 --- a/forked-test-driver +++ b/forked-test-driver @@ -108,9 +108,14 @@ trap "st=143; $do_exit" 15 # 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="${trs_file}.exit" : >"$log_file" -"$@" >>"$log_file" 2>&1 -estatus=$? +("$@" 2>&1; estatus=$?; echo $estatus >"$estatusfile") | tee -a "$log_file" +estatus=$(cat "$estatusfile") +rm -f "$estatusfile" if test $enable_hard_errors = no && test $estatus -eq 99; then tweaked_estatus=1