diff options
| author | Martin Schwenke <martin@meltin.net> | 2012-04-19 11:31:02 +1000 |
|---|---|---|
| committer | Martin Schwenke <martin@meltin.net> | 2012-04-27 15:40:43 +1000 |
| commit | 21b219075173e4e365d2fce271c1f4ea315455bf (patch) | |
| tree | 0a27f6f71d675e46b4fe9711c43f3d8037295ece /ctdb/tests/scripts/integration.bash | |
| parent | 43f1209dc4484f456ccd47254955c0eb4d484383 (diff) | |
| download | samba-21b219075173e4e365d2fce271c1f4ea315455bf.tar.gz samba-21b219075173e4e365d2fce271c1f4ea315455bf.tar.xz samba-21b219075173e4e365d2fce271c1f4ea315455bf.zip | |
tests: Remove ctdb_test_env
Move the contents to integration.bash and run_tests as appropriate.
Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit 6136ab02db261b26a2a58b526c913e37e8146841)
Diffstat (limited to 'ctdb/tests/scripts/integration.bash')
| -rw-r--r-- | ctdb/tests/scripts/integration.bash | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/ctdb/tests/scripts/integration.bash b/ctdb/tests/scripts/integration.bash index ae32e0b0f5..ea4ef5cf7e 100644 --- a/ctdb/tests/scripts/integration.bash +++ b/ctdb/tests/scripts/integration.bash @@ -19,6 +19,24 @@ fi ###################################################################### +export CTDB_TIMEOUT=60 + +if [ -n "$CTDB_TEST_REMOTE_DIR" ] ; then + CTDB_TEST_WRAPPER="${CTDB_TEST_REMOTE_DIR}/test_wrap" +else + CTDB_TEST_WRAPPER="${TEST_SCRIPTS_DIR}/test_wrap" +fi +export CTDB_TEST_WRAPPER + +# If $VALGRIND is set then use it whenever ctdb is called, but only if +# $CTDB is not already set. +[ -n "$CTDB" ] || export CTDB="${VALGRIND}${VALGRIND:+ }ctdb" + +# why??? +PATH="${TEST_SCRIPTS_DIR}:${PATH}" + +###################################################################### + ctdb_check_time_logs () { local threshold=20 |