summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorDavid Sommerseth <davids@redhat.com>2013-11-16 16:17:54 +0100
committerGert Doering <gert@greenie.muc.de>2013-11-16 18:35:25 +0100
commit8fedf86abaf8fca8d0e9e81f70d7a5888a98b9ee (patch)
tree1082acb615524a452ef2a94214a35ab66129d746 /tests
parentebcd7549ac73a2d649afd0629cb5a7fe0e02b8f7 (diff)
downloadopenvpn-8fedf86abaf8fca8d0e9e81f70d7a5888a98b9ee.tar.gz
openvpn-8fedf86abaf8fca8d0e9e81f70d7a5888a98b9ee.tar.xz
openvpn-8fedf86abaf8fca8d0e9e81f70d7a5888a98b9ee.zip
t_client.sh: Add prepare/cleanup possibilties for each test case
By adding PREPARE_$NUM and CLEANUP_$NUM variables containing command lines to execute before and after the test case is run. Signed-off-by: David Sommerseth <davids@redhat.com> Acked-by: Gert Doering <gert@greenie.muc.de> Message-Id: <1384615074-22345-1-git-send-email-dazo@users.sourceforge.net> URL: http://article.gmane.org/gmane.network.openvpn.devel/7990 Signed-off-by: Gert Doering <gert@greenie.muc.de>
Diffstat (limited to 'tests')
-rwxr-xr-xtests/t_client.sh.in13
1 files changed, 13 insertions, 0 deletions
diff --git a/tests/t_client.sh.in b/tests/t_client.sh.in
index b13c802..9b83e14 100755
--- a/tests/t_client.sh.in
+++ b/tests/t_client.sh.in
@@ -221,6 +221,8 @@ SUMMARY_FAIL=
for SUF in $TEST_RUN_LIST
do
# get config variables
+ eval test_prep=\"\$PREPARE_$SUF\"
+ eval test_cleanup=\"\$CLEANUP_$SUF\"
eval test_run_title=\"\$RUN_TITLE_$SUF\"
eval openvpn_conf=\"\$OPENVPN_CONF_$SUF\"
eval expect_ifconfig4=\"\$EXPECT_IFCONFIG4_$SUF\"
@@ -231,6 +233,11 @@ do
echo -e "\n### test run $SUF: '$test_run_title' ###\n"
fail_count=0
+ if [ -n "$test_prep" ]; then
+ echo -e "running preparation: '$test_prep'"
+ eval $test_prep
+ fi
+
echo "save pre-openvpn ifconfig + route"
get_ifconfig_route >$LOGDIR/$SUF:ifconfig_route_pre.txt
@@ -316,6 +323,12 @@ do
SUMMARY_FAIL="$SUMMARY_FAIL $SUF"
exit_code=30
fi
+
+ if [ -n "$test_cleanup" ]; then
+ echo -e "cleaning up: '$test_cleanup'"
+ eval $test_cleanup
+ fi
+
done
if [ -z "$SUMMARY_OK" ] ; then SUMMARY_OK=" none"; fi