tests/eventscripts: $CTDB_ETCDIR should be in $TEST_VAR_DIR

The policy routing tests modify /etc/iproute2/rt_tables, so this
directory should not be in the installation area.

Instead the contents of tests/eventscripts/etc are copied into a place
under $TEST_VAR_DIR where the directory can be modified with gay
abandon.

Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit a0afb4195caab39891a304b8b4eadd94cab7c4a7)

diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh
index c31e9fae26cea606d396bbd4c363db74f35dff52..afecf50bfadb624378b1e73965d214e845509887 100644 (file)
--- a/ctdb/tests/eventscripts/scripts/local.sh
+++ b/ctdb/tests/eventscripts/scripts/local.sh
@@ -15,12 +15,20 @@ export EVENTSCRIPTS_PATH
 
 PATH="${EVENTSCRIPTS_PATH}:${PATH}"
 
-if [ -d "${TEST_SUBDIR}/etc" ] ; then
-    CTDB_ETCDIR="${TEST_SUBDIR}/etc"
+export EVENTSCRIPTS_TESTS_VAR_DIR="${TEST_VAR_DIR}/unit_eventscripts"
+if [ -d "$EVENTSCRIPTS_TESTS_VAR_DIR" -a \
+    "$EVENTSCRIPTS_TESTS_VAR_DIR" != "/unit_eventscripts" ] ; then
+    rm -r "$EVENTSCRIPTS_TESTS_VAR_DIR"
+fi
+mkdir -p "$EVENTSCRIPTS_TESTS_VAR_DIR"
+export CTDB_VARDIR="$EVENTSCRIPTS_TESTS_VAR_DIR/ctdb"
+
+if [ -d "${TEST_SUBDIR}/etc" ] ; then    
+    cp -a "${TEST_SUBDIR}/etc" "$EVENTSCRIPTS_TESTS_VAR_DIR"
+    export CTDB_ETCDIR="${EVENTSCRIPTS_TESTS_VAR_DIR}/etc"
 else
-    die "Unable to set \$CTDB_ETCDIR"
+    die "Unable to setup \$CTDB_ETCDIR"
 fi
-export CTDB_ETCDIR
 
 if [ -d "${TEST_SUBDIR}/etc-ctdb" ] ; then
     CTDB_BASE="${TEST_SUBDIR}/etc-ctdb"
@@ -54,14 +62,6 @@ EOF
     exit 1
 fi
 
-export EVENTSCRIPTS_TESTS_VAR_DIR="${TEST_VAR_DIR}/unit_eventscripts"
-if [ -d "$EVENTSCRIPTS_TESTS_VAR_DIR" -a \
-    "$EVENTSCRIPTS_TESTS_VAR_DIR" != "/unit_eventscripts" ] ; then
-    rm -r "$EVENTSCRIPTS_TESTS_VAR_DIR"
-fi
-mkdir -p "$EVENTSCRIPTS_TESTS_VAR_DIR"
-export CTDB_VARDIR="$EVENTSCRIPTS_TESTS_VAR_DIR/ctdb"
-
 ######################################################################
 
 if "$TEST_VERBOSE" ; then