ctdb-tests: Use CTDB_SOCKET environment variable to specify socket

Use environment variables for test-only options.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/ctdb/tests/takeover_helper/scripts/local.sh b/ctdb/tests/takeover_helper/scripts/local.sh
index 4dd20d7ebbc7ce0303863313524d73c07683824f..c3a1ac0a0981f0525b460244a97d4b165b108e43 100644 (file)
--- a/ctdb/tests/takeover_helper/scripts/local.sh
+++ b/ctdb/tests/takeover_helper/scripts/local.sh
@@ -50,9 +50,10 @@ setup_ctdbd ()
 
        $VALGRIND fake_ctdbd -d "$FAKE_CTDBD_DEBUGLEVEL" \
                  -s "$ctdbd_socket" -p "$ctdbd_pidfile"
+       export CTDB_SOCKET="$ctdbd_socket"
        # This current translates to a 6 second timeout for the
        # important controls
-       ctdb --socket $ctdbd_socket setvar TakeoverTimeout 2
+       ctdb setvar TakeoverTimeout 2
        test_cleanup cleanup_ctdbd
 }
 
@@ -70,14 +71,13 @@ result_filter ()
 
 ctdb_cmd ()
 {
-       echo Running: ctdb -d "$CTDB_DEBUGLEVEL" --socket $ctdbd_socket "$@"
-       ctdb -d "$CTDB_DEBUGLEVEL" --socket $ctdbd_socket "$@"
+       echo Running: ctdb -d "$CTDB_DEBUGLEVEL" "$@"
+       ctdb -d "$CTDB_DEBUGLEVEL" "$@"
 }
 
 test_ctdb_ip_all ()
 {
-       unit_test ctdb -d "$CTDB_DEBUGLEVEL" \
-                 --socket $ctdbd_socket ip all || exit $?
+       unit_test ctdb -d "$CTDB_DEBUGLEVEL" ip all || exit $?
 }
 
 takeover_helper_out="${TEST_VAR_DIR}/takover_helper.out"

diff --git a/ctdb/tests/tool/scripts/local.sh b/ctdb/tests/tool/scripts/local.sh
index 7cee84a2d4bae327028349d3b7224da6f2fde6c0..c4aa08c7947c0542d094915de230bf01450bf454 100644 (file)
--- a/ctdb/tests/tool/scripts/local.sh
+++ b/ctdb/tests/tool/scripts/local.sh
@@ -19,7 +19,8 @@ define_test ()
        ctdb.*)
            _cmd="${_f#ctdb.}"
            _cmd="${_cmd%.*}" # Strip test number
-           export CTDB="ctdb --socket $ctdbd_socket"
+           export CTDB_SOCKET="$ctdbd_socket"
+           export CTDB="ctdb"
            export CTDB_DEBUGLEVEL=NOTICE
            if [ -z "$FAKE_CTDBD_DEBUGLEVEL" ] ; then
                    FAKE_CTDBD_DEBUGLEVEL="ERR"