From: "flichtenheld (Code Review)" Attention is currently required from: plaisthos. flichtenheld uploaded patch set #2 to this change.
tests: fork default automake test-driver
For some of the te= st we don't like the default log behavior
and there seems no easy wa= y to change that except to fork
the driver. The license seems unproblema= tic since we're
GPL anyway.
v2:
- Do not use forked-test-= driver for UTs. Default behavior
is fine for those.
Change-Id:= I67d461afbcc9c06b1fc5ab4477141d7b8bd9ba8e
Signed-off-by: Frank Lichtenh= eld <frank@...2641...>
---
M Makefile.am
A forked-test-drive= r
M tests/Makefile.am
3 files changed, 156 insertions(+), 1 deletion(= -)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/7= 8/478/2
diff --git a/Makefile.am b/Makefile.am
inde= x 2305ab4..6deecf3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,7 +44,8 @@
debu= g \
CMakeLists.txt \
CMakePresets.json = \
- config.h.cmake.in= span>
+ config.h.cmake.in \<= /span>
+ forked-test-driver<= /span>
.PHONY: config-version.h doxygen<= br>
diff --git a/forked-test-driver b/forked-test-dr= iver
new file mode 100755
index 0000000..be= 73b80
--- /dev/null
+++ b/forked-test-drive= r
@@ -0,0 +1,153 @@
+#! /bin/sh
+# test-driver - basic testsuite driver script.
+
+scriptversion=3D2018-03-07.03; # UTC
+
+# Copyright (C) 2011-2021 Free Software Foundation, Inc.
+#
+# This program is free software; you can = redistribute it and/or modify
+# it under the terms of the GNU General Public License as publish= ed by
+# the Free Sof= tware Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will b= e useful,
+# but WITH= OUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTI= CULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public Li= cense
+# along with t= his program. If not, see <https://www.gnu.org/licenses/>.
= +
+# As a special exception to the GNU General Publi= c License, if you
+# = distribute this file as part of a program that contains a
+# configuration script generated by A= utoconf, you may include it under
+# the same distribution terms that you use for the rest of th= at program.
+<= br>+# This file is maintained i= n Automake, please report
+# bugs to <bug-automake@...1269...> or send patches to+# <automake-patches@...1711...= 69...>.
++# Make unconditional expansi= on of undefined variables an error. This
+# helps a lot in preventing typo-related bugs.=
+set -u
+
+usage_error ()
+{
+ echo= "$0: $*" >&2
+ print_usage >&2
+ exit 2
+}
++print_usage ()
+{
+ cat <<END
+Usage:
+ test-driver --test-name NAME --log-file PATH --trs-file PATH<= br>+ [--expect-fai= lure {yes|no}] [--color-tests {yes|no}]
+ [--enable-hard-errors {yes|no}] [--]
+ TEST-SCRIP= T [TEST-SCRIPT-ARGUMENTS]
+
+The '--te= st-name', '--log-file' and '--trs-file' options are man= datory.
+See the GNU = Automake documentation for information.
+END
+}
++test_name=3D # Used for reporting= .
+log_file=3D # Whe= re to save the output of the test script.
+trs_file=3D # Where to save the metadata of the test= run.
+expect_failure= =3Dno
+color_tests=3D= no
+enable_hard_error= s=3Dyes
+while test $= # -gt 0; do
+ case $= 1 in
+ --help) print= _usage; exit $?;;
+ = --version) echo "test-driver $scriptversion"; exit $?;;
+ --test-name) test_name=3D$2= ; shift;;
+ --log-fi= le) log_file=3D$2; shift;;
+ --trs-file) trs_file=3D$2; shift;;
+ --color-tests) color_tests=3D$2; shift;;+ --expect-failure) expect_f= ailure=3D$2; shift;;
= + --enable-hard-errors) enable_hard_errors=3D$2; shift;;
+ --) shift; break;;
+ -*) usage_error "invalid opti= on: '$1'";;
+ *) break;;
+ = esac
+ shift=
+done
+
+missing_opts=3D
+test x"$test_name" =3D x && missing_opts=3D&qu= ot;$missing_opts --test-name"
+test x"$log_file" =3D x && missing_opts= =3D"$missing_opts --log-file"
+test x"$trs_file" =3D x && missing_o= pts=3D"$missing_opts --trs-file"
+if test x"$missing_opts" !=3D x; then
+ usage_error "the = following mandatory options are missing:$missing_opts"
+fi
+
+if test $# -eq 0; then
+ usage_error "missing argument"
+fi
+
+if tes= t $color_tests =3D yes; then
+ # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)&= #39;.
+ red=3D'= =1B[0;31m' # Red.
+ grn=3D'=1B[0;32m' # Green.
+ lgn=3D'=1B[1;32m' # Light green.+ blu=3D'=1B[1;34m' # Blu= e.
+ mgn=3D'=1B[= 0;35m' # Magenta.
+ std=3D'=1B[m' # No color.
+else
+ red=3D grn=3D lgn=3D blu=3D mgn=3D std=3D
+fi
+
+do_ex= it=3D'rm -f $log_file $trs_file; (exit $st); exit $st'+trap "st=3D129; $do_exit&qu= ot; 1
+trap "st= =3D130; $do_exit" 2
+trap "st=3D141; $do_exit" 13
+trap "st=3D143; $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= span>
+# don't, but othe= rs can (automake bug#35762).
+: >"$log_file"
+"$@" >>"$log_file" 2>&1= span>
+estatus=3D$?+
+if test $enable_hard_errors =3D no && t= est $estatus -eq 99; then
+ tweaked_estatus=3D1
+else
+ tweak= ed_estatus=3D$estatus
+fi
++case $tweaked_estatus:$expect_fail= ure in
+ 0:yes) col= =3D$red res=3DXPASS recheck=3Dyes gcopy=3Dyes;;
+ 0:*) col=3D$grn res=3DPASS recheck=3Dno g= copy=3Dno;;
+ 77:*) = col=3D$blu res=3DSKIP recheck=3Dno gcopy=3Dyes;;
+ 99:*) col=3D$mgn res=3DERROR recheck= =3Dyes gcopy=3Dyes;;
= + *:yes) col=3D$lgn res=3DXFAIL recheck=3Dno gcopy=3Dyes;;+ *:*) col=3D$red res=3DFAIL re= check=3Dyes gcopy=3Dyes;;
+esac
++# Report the test outcome an= d exit status in the logs, so that one can
+# know whether the test passed or failed simply by l= ooking at the '.log'
+# file, without the need of also peaking into the corresponding = 39;.trs'
+# file = (automake bug#11814).
+echo "$res $test_name (exit status: $estatus)" >>"$l= og_file"
+
+# Report outcome to conso= le.
+echo "${col= }${res}${std}: $test_name"
+
+# Regis= ter the test result, and other relevant metadata.
+echo ":test-result: $res" > $trs= _file
+echo ":gl= obal-test-result: $res" >> $trs_file
+echo ":recheck: $recheck" >> $t= rs_file
+echo ":= copy-in-global-log: $gcopy" >> $trs_file
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-start: &qu= ot;scriptversion=3D"
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC0&qu= ot;
+# time-stamp-end= : "; # UTC"
+# End:
diff --git a/tests/Makefile.am b/tests/Makefile.am=
index 6c71067..b3b2d74 100644
--- a/tests/= Makefile.am
+++ b/tests/Makefile.am
@@ -15,= 6 +15,7 @@
SUBDIRS =3D unit_tests
=
AM_TESTSUITE_SUMMARY_HEADER =3D ' for $(PACKAGE_STRING) Syst= em Tests'
+LOG_DR= IVER =3D $(SHELL) $(top_srcdir)/forked-test-driver
=
if !WIN32
test_scripts =3D t_client.sh t_lpback= .sh t_cltsrv.sh
To view, visit change 478. = To unsubscribe, or for help writing mail filters, visit settings.