-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 13/09/16 22:04, Gert Doering wrote: > Basically, an oversight - if one test instance does not start at > all (due to "tap driver not loaded") the whole script would exit, > instead of logging the failing instance and proceeding to the next > test run. > > Signed-off-by: Gert Doering <g...@greenie.muc.de> --- > tests/t_client.sh.in | 10 +++++++--- 1 file changed, 7 > insertions(+), 3 deletions(-) > > diff --git a/tests/t_client.sh.in b/tests/t_client.sh.in index > 9a0af93..62d6730 100755 --- a/tests/t_client.sh.in +++ > b/tests/t_client.sh.in @@ -279,10 +279,14 @@ do if $RUN_SUDO kill > -0 $opid then : else - echo -e "OpenVPN process has failed to start > up, check log ($LOGDIR/$SUF:openvpn.log). FAIL.\ntail of logfile > follows:\n..." >&2 - tail $LOGDIR/$SUF:openvpn.log >&2 + fail > "OpenVPN process has failed to start up, check log > ($LOGDIR/$SUF:openvpn.log)." + echo "tail -5 $SUF:openvpn.log" >&2 > + tail -5 $LOGDIR/$SUF:openvpn.log >&2 + echo -e "\nFAIL. skip rest > of sub-tests for test run $SUF.\n" >&2 trap - 0 1 2 3 15 - exit 10 > + SUMMARY_FAIL="$SUMMARY_FAIL $SUF" + exit_code=30 + continue fi > > # compare whether anything changed in ifconfig/route setup? >
ACK. This looks reasonable and if I know Gert well enough, this is also tested. - -- kind regards, David Sommerseth -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAEBAgAGBQJX2/1uAAoJEIbPlEyWcf3yBigP+wRnqdDlL8TmYZlK4pJspQKk nHfFrm1mWCJhZYlkeAlTtFrXF2K4/l/kPImdb/w5vLLdY2jT3+AxKulTcm5FVa1s NKPhOAD/SqAzjLACWhFBK2buwFPfHzobuey821rHTNlmaNXcrMTlEntsu+hPVGyJ jlx5Zx5Dez1JF8RbON8X1Q8bshd7cAqYMcxeUQA1xHE6EpdUDm8yLPc5tdhoMpFe a1To6BX2X7dkZb+NE8ZhHGylOgRUBseTH+EVwKkC/AftglrmVOWKVn5hIpn5HCeS 2D/gWVeSE7F8YzOktEJEwTnE2yx3YSdoqqeFCK02HIetuBs9sH2n2lLFx0VJ9Fe9 4sLdqysJ1fZaNU6Se5/LuidUycqgDeZ8zI+GBINFPjK8VGWxZ7kSK1q9zKPneEBM dinvB8y2etlTxsvJXiA6tH/CgfzZYwuxoWcjxcqK2LsfnKxzv8QRDQq3shALrKMe QG7CI0ioWWONYe8j7UGQytnw5nVLH5Z2Wla+JBU1D9YN8K6HWPGw0ko6TjBwRlvJ 2eyQmO54Fq4EnwBvoDjqJYmNdeiP5/zhYalCryvp8Kdrbv6NXUzDXmVYaNcm+0+p egJ7gh+cYvCOsbVpJ3ziZoe9aAw/+hh1BR1tGkmPPTHMFfcxTRyQhWrXodip1mK9 T7CeH9CJsFISXpjkiETU =efGi -----END PGP SIGNATURE----- ------------------------------------------------------------------------------ _______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
