From: Amitay Isaacs <amitay@gmail.com>
Date: Thu, 21 Jun 2018 08:02:06 +0000 (+1000)
Subject: ctdb-tests: Switch to using new event daemon
X-Git-Tag: tevent-0.9.37~93
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dda99e49e3be6295cf91d4dffe010361469f8eb1;p=thirdparty%2Fsamba.git

ctdb-tests: Switch to using new event daemon

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

Autobuild-User(master): Martin Schwenke <martins@samba.org>
Autobuild-Date(master): Thu Jul  5 09:39:33 CEST 2018 on sn-devel-144
---

diff --git a/ctdb/tests/simple/scripts/local_daemons.bash b/ctdb/tests/simple/scripts/local_daemons.bash
index a47080574a9..dd383cf6289 100644
--- a/ctdb/tests/simple/scripts/local_daemons.bash
+++ b/ctdb/tests/simple/scripts/local_daemons.bash
@@ -7,8 +7,8 @@ if [ -n "$ctdb_dir" -a -d "${ctdb_dir}/bin" ] ; then
 	# ctdbd_wrapper is in config/ directory
 	PATH="${ctdb_dir}/bin:${ctdb_dir}/config:${PATH}"
 	hdir="${ctdb_dir}/bin"
-	export CTDB_EVENTD="${hdir}/ctdb_eventd"
-	export CTDB_EVENT_HELPER="${hdir}/ctdb_event"
+	export CTDB_EVENTD="${hdir}/ctdb-eventd"
+	export CTDB_EVENT_HELPER="${hdir}/ctdb-event"
 	export CTDB_LOCK_HELPER="${hdir}/ctdb_lock_helper"
 	export CTDB_RECOVERY_HELPER="${hdir}/ctdb_recovery_helper"
 	export CTDB_TAKEOVER_HELPER="${hdir}/ctdb_takeover_helper"
@@ -155,7 +155,7 @@ setup_ctdb ()
 	state database directory = ${db_dir}/state
 
 [event]
-	debug script = ${CTDB_BASE}/debug-hung-script.sh
+	debug script = debug-hung-script.sh
 EOF
 	done
 }