diff options
| author | Martin Schwenke <martin@meltin.net> | 2012-04-16 14:27:22 +1000 |
|---|---|---|
| committer | Martin Schwenke <martin@meltin.net> | 2012-04-16 14:57:44 +1000 |
| commit | a530358b2f0d1db145ddef002c678b548211c5a1 (patch) | |
| tree | e97b9076aeb218e5feaf3f6c6c64971b12c61d93 | |
| parent | e5f5a101ee73dc292c94560982eeeece0ff08717 (diff) | |
| download | samba-a530358b2f0d1db145ddef002c678b548211c5a1.tar.gz samba-a530358b2f0d1db145ddef002c678b548211c5a1.tar.xz samba-a530358b2f0d1db145ddef002c678b548211c5a1.zip | |
tests - export new variable TEST_SCRIPTS_DIR
This replaces previous script-local variable ctdb_test_scripts_dir.
Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit 107b465172205cb304549fcffaf36b9416696c15)
| -rwxr-xr-x | ctdb/tests/scripts/ctdb_test_env | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ctdb/tests/scripts/ctdb_test_env b/ctdb/tests/scripts/ctdb_test_env index f550d7945f..18d100f3d8 100755 --- a/ctdb/tests/scripts/ctdb_test_env +++ b/ctdb/tests/scripts/ctdb_test_env @@ -1,14 +1,14 @@ #!/bin/bash -ctdb_test_scripts_dir=$(cd $(dirname $0) ; pwd) -export CTDB_DIR=$(dirname $(dirname $ctdb_test_scripts_dir)) +export TEST_SCRIPTS_DIR=$(cd $(dirname $0) ; pwd) +export CTDB_DIR=$(dirname $(dirname $TEST_SCRIPTS_DIR)) var_dir=$CTDB_DIR/tests/var ###################################################################### ctdb_tools_dir=$CTDB_DIR/tools -PATH="${ctdb_test_scripts_dir}:${ctdb_tools_dir}:${PATH}" +PATH="${TEST_SCRIPTS_DIR}:${ctdb_tools_dir}:${PATH}" export CTDB_TIMEOUT=60 @@ -17,7 +17,7 @@ export CTDB_TIMEOUT=60 if [ -n "$CTDB_TEST_REMOTE_DIR" ] ; then CTDB_TEST_WRAPPER="${CTDB_TEST_REMOTE_DIR}/test_wrap" else - CTDB_TEST_WRAPPER="${ctdb_test_scripts_dir}/test_wrap" + CTDB_TEST_WRAPPER="${TEST_SCRIPTS_DIR}/test_wrap" fi export CTDB_TEST_WRAPPER |