From: Martin Schwenke <martin@meltin.net>
Date: Thu, 5 Apr 2018 05:46:53 +0000 (+1000)
Subject: ctdb-tests: Make local daemon tests depend on CTDB_TEST_MODE
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=5081cec49e33031c117e8fa6c876e186fade0904;p=metze%2Fsamba%2Fwip.git

ctdb-tests: Make local daemon tests depend on CTDB_TEST_MODE

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

diff --git a/ctdb/tests/simple/scripts/local_daemons.bash b/ctdb/tests/simple/scripts/local_daemons.bash
index 5f4eb457f312..a17fef2b9988 100644
--- a/ctdb/tests/simple/scripts/local_daemons.bash
+++ b/ctdb/tests/simple/scripts/local_daemons.bash
@@ -145,7 +145,6 @@ CTDB_DEBUGLEVEL=INFO
 CTDB_DBDIR="${db_dir}"
 CTDB_DBDIR_PERSISTENT="${db_dir}/persistent"
 CTDB_DBDIR_STATE="${db_dir}/state"
-CTDB_NOSETSCHED=yes
 EOF
 	done
 }
@@ -154,7 +153,7 @@ start_ctdb_1 ()
 {
 	local pnn="$1"
 
-	CTDBD="${VALGRIND} ctdbd --sloppy-start --nopublicipcheck" \
+	CTDBD="${VALGRIND} ctdbd" \
 	     onnode "$pnn" ctdbd_wrapper start
 }