diff options
| author | Martin Schwenke <martin@meltin.net> | 2012-04-27 14:17:52 +1000 |
|---|---|---|
| committer | Martin Schwenke <martin@meltin.net> | 2012-04-27 15:42:43 +1000 |
| commit | a4f4df233fafe4bda1ebdf906947d4bfb5955ce3 (patch) | |
| tree | 1b1bc9d943dc143fb737d99ebf80a0a0976578a3 | |
| parent | 4528c55d3e44a79396d2d47b3f27f63aeb20f97d (diff) | |
| download | samba-a4f4df233fafe4bda1ebdf906947d4bfb5955ce3.tar.gz samba-a4f4df233fafe4bda1ebdf906947d4bfb5955ce3.tar.xz samba-a4f4df233fafe4bda1ebdf906947d4bfb5955ce3.zip | |
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)
| -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 |