diff options
Diffstat (limited to 'ctdb/tests/eventscripts/scripts')
| -rw-r--r-- | ctdb/tests/eventscripts/scripts/local.sh | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh index c31e9fae26..afecf50bfa 100644 --- 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 |