[Openvpn-devel] another t_client.sh patch...

[Gert Doering]

From b5b301591ef0804084bd661d090d36aa44100101 Mon Sep 17 00:00:00 2001
From: Gert Doering <g...@greenie.muc.de>
List-Post: openvpn-devel@lists.sourceforge.net
Date: Thu, 7 Jun 2012 17:35:53 +0200
Subject: [PATCH] t_client.sh - fix for iproute2, print summary line

Yet another postprocess-output fix for iproute2 (sometimes there was
no whitespace in the output, so substituting away expiry time failed).

Print summary line of succeeded and failed test sets at the very end.

Signed-off-by: Gert Doering <g...@greenie.muc.de>
---
 tests/t_client.sh.in |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/tests/t_client.sh.in b/tests/t_client.sh.in
index d58b821..8c66033 100755
--- a/tests/t_client.sh.in
+++ b/tests/t_client.sh.in
@@ -91,7 +91,7 @@ get_ifconfig_route()
        echo "-- linux iproute2 --"
        @IPROUTE@ addr show     | grep -v valid_lft
        @IPROUTE@ route show
-       @IPROUTE@ -o -6 route show | grep -v ' cache' | sed -e 's/expires 
[0-9]*sec //'
+       @IPROUTE@ -o -6 route show | grep -v ' cache' | sed -e 's/expires 
[0-9]*sec//'
        return
     fi
 
@@ -203,6 +203,9 @@ run_ping_tests()
 # ----------------------------------------------------------
 # main test loop
 # ----------------------------------------------------------
+SUMMARY_OK=
+SUMMARY_FAIL=
+
 for SUF in $TEST_RUN_LIST
 do
     # get config variables
@@ -294,12 +297,19 @@ do
     fi
     if [ "$fail_count" = 0 ] ; then
         echo -e "test run $SUF: all tests OK.\n"
+       SUMMARY_OK="$SUMMARY_OK $SUF"
     else
        echo -e "test run $SUF: $fail_count test failures. FAIL.\n";
+       SUMMARY_FAIL="$SUMMARY_FAIL $SUF"
        exit_code=30
     fi
 done
 
+if [ -z "$SUMMARY_OK" ] ; then SUMMARY_OK=" none"; fi
+if [ -z "$SUMMARY_FAIL" ] ; then SUMMARY_FAIL=" none"; fi
+echo "Test sets succeded:$SUMMARY_OK."
+echo "Test sets failed:$SUMMARY_FAIL."
+
 # remove trap handler
 trap - 0 1 2 3 15
 exit $exit_code
-- 
1.5.6.5

-- 
USENET is *not* the non-clickable part of WWW!
                                                           //www.muc.de/~gert/
Gert Doering - Munich, Germany                             g...@greenie.muc.de
fax: +49-89-35655025                        g...@net.informatik.tu-muenchen.de

pgpiIK_1NtTfd.pgp
Description: PGP signature