1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-27 14:04:05 +03:00

tests: Unit tests should use $TEST_VAR_DIR

This directory is already guaranteed to be absolute, so no check is
needed.

Signed-off-by: Martin Schwenke <martin@meltin.net>

(This used to be ctdb commit 78f6f209eb15102f4e8baa9106583df0ef4bb693)
This commit is contained in:
Martin Schwenke 2012-04-24 14:02:28 +10:00
parent b7b6f10e9b
commit cb09959063
2 changed files with 3 additions and 8 deletions

View File

@ -29,8 +29,8 @@ else
fi
export CTDB_BASE
export EVENTSCRIPTS_TESTS_VAR_DIR="${TEST_SUBDIR}/var"
if [ "$EVENTSCRIPTS_TESTS_VAR_DIR" != "/var" ] ; then
export EVENTSCRIPTS_TESTS_VAR_DIR="${TEST_VAR_DIR}/unit_eventscripts"
if [ "$EVENTSCRIPTS_TESTS_VAR_DIR" != "/unit_eventscripts" ] ; then
rm -r "$EVENTSCRIPTS_TESTS_VAR_DIR"
fi
mkdir -p "$EVENTSCRIPTS_TESTS_VAR_DIR"
@ -67,11 +67,6 @@ setup_generic ()
for i in $(seq 1 3) ; do
_s="${EVENTSCRIPTS_TESTS_VAR_DIR}/shares/${i}_existing"
mkdir -p "$_s"
# Shares must begin with /
case "$_s" in
/*) : ;;
*) _s="${PWD}/$_s"
esac
FAKE_SHARES="${FAKE_SHARES}${FAKE_SHARES:+ }${_s}"
done

View File

@ -23,7 +23,7 @@ fi
export CTDB_NODES_FILE
export ONNODE_TESTS_VAR_DIR="${TEST_SUBDIR}/var"
export ONNODE_TESTS_VAR_DIR="${TEST_VAR_DIR}/unit_onnode"
mkdir -p "$ONNODE_TESTS_VAR_DIR"
if [ -z "$CTDB_BASE" ] ; then