From: "flichtenheld (Code Review)" flichtenheld uploaded patch set #9 to this change.
The change is no longer submittable: checks~ChecksSubmitRule= is unsatisfied now.
tests: fork default automake test-driver
For so= me of the test we don't like the default log behavior
and there seem= s no easy way to change that except to fork
the driver. The license seem= s unproblematic 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: Fr= ank Lichtenheld <frank@...2641...>
---
M Makefile.am
A forke= d-test-driver
M tests/Makefile.am
3 files changed, 156 insertions(+),= 1 deletion(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn re= fs/changes/78/478/9
diff --git a/Makefile.am b/Makefile.amindex 792588a..d93bd1b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,7 +45,8 @@
= ltrc.inc \
CMakeLists.txt \
CMa= kePresets.json \
- conf= ig.h.cmake.in
+ confi= g.h.cmake.in \
+ fork= ed-test-driver
.PHONY: config-version.h = doxygen
diff --git a/forked-test-driver b= /forked-test-driver
new file mode 100755
in= dex 0000000..be73b80
--- /dev/null
+++ b/fo= rked-test-driver
@@ -0,0 +1,153 @@
+#! /bin/sh
+# test-driver - basic testsuite driver script.=
+
+scriptversion=3D2018-03-07.03; # UTC+
+# Copyright (C) 2011-2021 Free Software Foundat= ion, Inc.
+#+# This program is free softw= are; you can redistribute it and/or modify
+# it under the terms of the GNU General Public Licen= se as published by
+#= the Free Software Foundation; either version 2, or (at your option)=
+# any later version.
+#
+# This program is distributed in the hope= that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITN= ESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Ge= neral Public License
= +# along with this program. If not, see <https://www.gnu.org/licenses/&= gt;.
++# As a special exception to the GN= U General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script= generated by Autoconf, you may include it under
+# the same distribution terms that you use for= the rest of that program.
+
+# This file = is maintained in Automake, please report
+# bugs to <bug-automake@...1269...> or send patc= hes to
+# <automak= e-patches@...1269...>.
+
+# Make uncond= itional expansion of undefined variables an error. This
+# helps a lot in preventing typo-relat= ed 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
+ = [--expect-failure {yes|no}] [--color-tests {yes|no}]
+ [--enable-hard-errors {= yes|no}] [--]
+ = TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
+
+The '--test-name', '--log-file' and '--trs-file= 9; options are mandatory.
+See the GNU Automake documentation for information.
+END
+}
+
+test_name=3D # = Used for reporting.
+= log_file=3D # Where to save the output of the test script.
+trs_file=3D # Where to save the me= tadata of the test run.
+expect_failure=3Dno
+color_tests=3Dno
= +enable_hard_errors=3Dyes
+while test $# -gt 0; do
+ case $1 in
+ --help) print_usage; exit $?;;
+ --version) echo "test-driver $scriptversion"; e= xit $?;;
+ --test-na= me) test_name=3D$2; shift;;
+ --log-file) log_file=3D$2; shift;;
+ --trs-file) trs_file=3D$2; shift;;+ --color-tests) color_tests=3D$2= ; shift;;
+ --expect= -failure) expect_failure=3D$2; shift;;
+ --enable-hard-errors) enable_hard_errors=3D$2; shift;;=
+ --) shift; break;= ;
+ -*) usage_error = "invalid option: '$1'";;
+ *) break;;
+ esac
+ shift
+done
+
+missing_opts=3D
+test x"$test_name" =3D x &&= missing_opts=3D"$missing_opts --test-name"
+test x"$log_file" =3D x &&= amp; missing_opts=3D"$missing_opts --log-file"
+test x"$trs_file" =3D x &am= p;& missing_opts=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 test $color_tests =3D yes; then
+ # Keep this in sync with 'lib/am/check.am:$= (am__tty_colors)'.
+ red=3D'=1B[0;31m' # Red.
+ grn=3D'=1B[0;32m' # Green.
+ lgn=3D'=1B[1;32m' # Light gree= n.
+ blu=3D'=1B[= 1;34m' # Blue.
+ = 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_exit=3D'rm -f $log_file $trs_file; (exit $st); exit $st= 39;
+trap "st=3D= 129; $do_exit" 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 fi= le. Our tests
+# don&= #39;t, but others can (automake bug#35762).
+: >"$log_file"
+"$@" >>"$log_file&qu= ot; 2>&1
+esta= tus=3D$?
+
= +if test $enable_hard_errors = =3D no && test $estatus -eq 99; then
+ tweaked_estatus=3D1
+else
+ tweaked_estatus=3D$estatus
+fi
+
+case $tweaked_e= status:$expect_failure in
+ 0:yes) col=3D$red res=3DXPASS recheck=3Dyes gcopy=3Dyes;;
+ 0:*) col=3D$grn res=3DPAS= S recheck=3Dno gcopy=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$re= d res=3DFAIL recheck=3Dyes gcopy=3Dyes;;
+esac
+
+# Report the= test outcome and exit status in the logs, so that one can
+# know whether the test passed or fa= iled simply by looking at the '.log'
+# file, without the need of also peaking into the = corresponding '.trs'
+# file (automake bug#11814).
+echo "$res $test_name (exit status: $estatus)" = >>"$log_file"
+
+# Report = outcome to console.
+= echo "${col}${res}${std}: $test_name"
+
+# Register the test result, and other relevant metadata.
+echo ":test-result: $res= " > $trs_file
+echo ":global-test-result: $res" >> $trs_file
<= span style=3D"color: hsl(120, 100%, 40%);">+echo ":recheck: $recheck&q= uot; >> $trs_file
+echo ":copy-in-global-log: $gcopy" >> $trs_file<= br>+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 't= ime-stamp)
+# time-st= amp-start: "scriptversion=3D"
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone:= "UTC0"
+# = time-stamp-end: "; # UTC"
+# End:
diff --git a/tests/Makefile.am b/tes= ts/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 $(PACKAG= E_STRING) System Tests'
+LOG_DRIVER =3D $(SHELL) $(top_srcdir)/forked-test-driver
=
if !WIN32
test_scripts =3D t_clie= nt.sh t_lpback.sh t_cltsrv.sh
To view, = visit cha= nge 478. To unsubscribe, or for help writing mail filters, visit settings.