From: David Sommerseth <dazo@users.sourceforge.net>
Date: Wed, 18 Aug 2010 13:00:13 +0000 (+0200)
Subject: Test framework improvment - Do not FAIL if t_client.rc is missing
X-Git-Tag: v2.2-beta4~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f25fe91a40aa3fad21657f590fd5f5c34d9f64d9;p=thirdparty%2Fopenvpn.git

Test framework improvment - Do not FAIL if t_client.rc is missing

This is to avoid 'make check' fail if this extra test case is not
configured.

Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
Acked-by: Gert Doering <gert@greenie.muc.de>
---

diff --git a/t_client.sh.in b/t_client.sh.in
index 664b2fdeb..d3a429562 100755
--- a/t_client.sh.in
+++ b/t_client.sh.in
@@ -12,6 +12,16 @@
 # - for "ping6" checks: fping6 binary in $PATH
 #
 
+if [ -r ./t_client.rc ] ; then
+    . ./t_client.rc
+elif [ -r "${srcdir}"/t_client.rc ] ; then
+    . "${srcdir}"/t_client.rc
+else
+    echo "$0: cannot find 't_client.rc' in current directory or" >&2
+    echo "$0: source dir ('${srcdir}').  SKIPPING TEST." >&2
+    exit 77
+fi
+
 if [ ! -x ./openvpn ]
 then
     echo "no (executable) openvpn binary in current directory. FAIL." >&2
@@ -24,16 +34,6 @@ then
     exit 1
 fi
 
-if [ -r ./t_client.rc ] ; then
-    . ./t_client.rc
-elif [ -r "${srcdir}"/t_client.rc ] ; then
-    . "${srcdir}"/t_client.rc
-else
-    echo "cannot find 't_client.rc' in current directory or" >&2
-    echo "source dir ('${srcdir}').  FAIL." >&2
-    exit 1
-fi
-
 if [ -z "$CA_CERT" ] ; then
     echo "CA_CERT not defined in 't_client.rc'. SKIP test." >&2
     exit 0