134 files changed, 1 insertions, 1 deletions
diff --git a/ctdb/tests/tool/README b/ctdb/tests/UNIT/tool/README
index 816052862fd..816052862fd 100644
--- a/ctdb/tests/tool/README
+++ b/ctdb/tests/UNIT/tool/README
diff --git a/ctdb/tests/tool/ctdb.attach.001.sh b/ctdb/tests/UNIT/tool/ctdb.attach.001.sh
index 82c333282a9..82c333282a9 100755
--- a/ctdb/tests/tool/ctdb.attach.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.attach.001.sh
diff --git a/ctdb/tests/tool/ctdb.attach.002.sh b/ctdb/tests/UNIT/tool/ctdb.attach.002.sh
index a4719bff3bf..a4719bff3bf 100755
--- a/ctdb/tests/tool/ctdb.attach.002.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.attach.002.sh
diff --git a/ctdb/tests/tool/ctdb.attach.003.sh b/ctdb/tests/UNIT/tool/ctdb.attach.003.sh
index 1a4cdebc123..1a4cdebc123 100755
--- a/ctdb/tests/tool/ctdb.attach.003.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.attach.003.sh
diff --git a/ctdb/tests/tool/ctdb.ban.001.sh b/ctdb/tests/UNIT/tool/ctdb.ban.001.sh
index 3c17f752d76..3c17f752d76 100755
--- a/ctdb/tests/tool/ctdb.ban.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.ban.001.sh
diff --git a/ctdb/tests/tool/ctdb.ban.002.sh b/ctdb/tests/UNIT/tool/ctdb.ban.002.sh
index 47a9995886f..47a9995886f 100755
--- a/ctdb/tests/tool/ctdb.ban.002.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.ban.002.sh
diff --git a/ctdb/tests/tool/ctdb.ban.003.sh b/ctdb/tests/UNIT/tool/ctdb.ban.003.sh
index 95acf500b5b..95acf500b5b 100755
--- a/ctdb/tests/tool/ctdb.ban.003.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.ban.003.sh
diff --git a/ctdb/tests/tool/ctdb.catdb.001.sh b/ctdb/tests/UNIT/tool/ctdb.catdb.001.sh
index 7fef1f17304..7fef1f17304 100755
--- a/ctdb/tests/tool/ctdb.catdb.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.catdb.001.sh
diff --git a/ctdb/tests/tool/ctdb.catdb.002.sh b/ctdb/tests/UNIT/tool/ctdb.catdb.002.sh
index 52583088a59..52583088a59 100755
--- a/ctdb/tests/tool/ctdb.catdb.002.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.catdb.002.sh
diff --git a/ctdb/tests/tool/ctdb.cattdb.001.sh b/ctdb/tests/UNIT/tool/ctdb.cattdb.001.sh
index be549e2bda9..be549e2bda9 100755
--- a/ctdb/tests/tool/ctdb.cattdb.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.cattdb.001.sh
diff --git a/ctdb/tests/tool/ctdb.cattdb.002.sh b/ctdb/tests/UNIT/tool/ctdb.cattdb.002.sh
index 03c5e7f07d8..03c5e7f07d8 100755
--- a/ctdb/tests/tool/ctdb.cattdb.002.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.cattdb.002.sh
diff --git a/ctdb/tests/tool/ctdb.continue.001.sh b/ctdb/tests/UNIT/tool/ctdb.continue.001.sh
index fef1e00c65a..fef1e00c65a 100755
--- a/ctdb/tests/tool/ctdb.continue.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.continue.001.sh
diff --git a/ctdb/tests/tool/ctdb.continue.002.sh b/ctdb/tests/UNIT/tool/ctdb.continue.002.sh
index 55ce7f502bf..55ce7f502bf 100755
--- a/ctdb/tests/tool/ctdb.continue.002.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.continue.002.sh
diff --git a/ctdb/tests/tool/ctdb.continue.003.sh b/ctdb/tests/UNIT/tool/ctdb.continue.003.sh
index 72801256011..72801256011 100755
--- a/ctdb/tests/tool/ctdb.continue.003.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.continue.003.sh
diff --git a/ctdb/tests/tool/ctdb.deletekey.001.sh b/ctdb/tests/UNIT/tool/ctdb.deletekey.001.sh
index f530801bf7f..f530801bf7f 100755
--- a/ctdb/tests/tool/ctdb.deletekey.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.deletekey.001.sh
diff --git a/ctdb/tests/tool/ctdb.disable.001.sh b/ctdb/tests/UNIT/tool/ctdb.disable.001.sh
index b2e419b96bd..b2e419b96bd 100755
--- a/ctdb/tests/tool/ctdb.disable.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.disable.001.sh
diff --git a/ctdb/tests/tool/ctdb.disable.002.sh b/ctdb/tests/UNIT/tool/ctdb.disable.002.sh
index ac90c75f615..ac90c75f615 100755
--- a/ctdb/tests/tool/ctdb.disable.002.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.disable.002.sh
diff --git a/ctdb/tests/tool/ctdb.disable.003.sh b/ctdb/tests/UNIT/tool/ctdb.disable.003.sh
index ef02ba0bb21..ef02ba0bb21 100755
--- a/ctdb/tests/tool/ctdb.disable.003.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.disable.003.sh
diff --git a/ctdb/tests/tool/ctdb.disable.004.sh b/ctdb/tests/UNIT/tool/ctdb.disable.004.sh
index da39d67ca73..da39d67ca73 100755
--- a/ctdb/tests/tool/ctdb.disable.004.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.disable.004.sh
diff --git a/ctdb/tests/tool/ctdb.enable.001.sh b/ctdb/tests/UNIT/tool/ctdb.enable.001.sh
index 9234f195967..9234f195967 100755
--- a/ctdb/tests/tool/ctdb.enable.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.enable.001.sh
diff --git a/ctdb/tests/tool/ctdb.enable.002.sh b/ctdb/tests/UNIT/tool/ctdb.enable.002.sh
index ee9b2103b20..ee9b2103b20 100755
--- a/ctdb/tests/tool/ctdb.enable.002.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.enable.002.sh
diff --git a/ctdb/tests/tool/ctdb.enable.003.sh b/ctdb/tests/UNIT/tool/ctdb.enable.003.sh
index 37656c24f68..37656c24f68 100755
--- a/ctdb/tests/tool/ctdb.enable.003.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.enable.003.sh
diff --git a/ctdb/tests/tool/ctdb.getcapabilities.001.sh b/ctdb/tests/UNIT/tool/ctdb.getcapabilities.001.sh
index d04db04b60d..d04db04b60d 100755
--- a/ctdb/tests/tool/ctdb.getcapabilities.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.getcapabilities.001.sh
diff --git a/ctdb/tests/tool/ctdb.getcapabilities.002.sh b/ctdb/tests/UNIT/tool/ctdb.getcapabilities.002.sh
index f54786290e5..f54786290e5 100755
--- a/ctdb/tests/tool/ctdb.getcapabilities.002.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.getcapabilities.002.sh
diff --git a/ctdb/tests/tool/ctdb.getcapabilities.003.sh b/ctdb/tests/UNIT/tool/ctdb.getcapabilities.003.sh
index 74702d5b5e7..74702d5b5e7 100755
--- a/ctdb/tests/tool/ctdb.getcapabilities.003.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.getcapabilities.003.sh
diff --git a/ctdb/tests/tool/ctdb.getcapabilities.004.sh b/ctdb/tests/UNIT/tool/ctdb.getcapabilities.004.sh
index ae4ad2b5246..ae4ad2b5246 100755
--- a/ctdb/tests/tool/ctdb.getcapabilities.004.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.getcapabilities.004.sh
diff --git a/ctdb/tests/tool/ctdb.getdbmap.001.sh b/ctdb/tests/UNIT/tool/ctdb.getdbmap.001.sh
index f766e9c0e38..f766e9c0e38 100755
--- a/ctdb/tests/tool/ctdb.getdbmap.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.getdbmap.001.sh
diff --git a/ctdb/tests/tool/ctdb.getdbseqnum.001.sh b/ctdb/tests/UNIT/tool/ctdb.getdbseqnum.001.sh
index 95ef244a69b..95ef244a69b 100755
--- a/ctdb/tests/tool/ctdb.getdbseqnum.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.getdbseqnum.001.sh
diff --git a/ctdb/tests/tool/ctdb.getdbseqnum.002.sh b/ctdb/tests/UNIT/tool/ctdb.getdbseqnum.002.sh
index e0274f339be..e0274f339be 100755
--- a/ctdb/tests/tool/ctdb.getdbseqnum.002.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.getdbseqnum.002.sh
diff --git a/ctdb/tests/tool/ctdb.getdbstatus.001.sh b/ctdb/tests/UNIT/tool/ctdb.getdbstatus.001.sh
index 5a2b79e0b6f..5a2b79e0b6f 100755
--- a/ctdb/tests/tool/ctdb.getdbstatus.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.getdbstatus.001.sh
diff --git a/ctdb/tests/tool/ctdb.getdbstatus.002.sh b/ctdb/tests/UNIT/tool/ctdb.getdbstatus.002.sh
index 2ff6e7b926c..2ff6e7b926c 100755
--- a/ctdb/tests/tool/ctdb.getdbstatus.002.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.getdbstatus.002.sh
diff --git a/ctdb/tests/tool/ctdb.getpid.001.sh b/ctdb/tests/UNIT/tool/ctdb.getpid.001.sh
index 57141022f84..57141022f84 100755
--- a/ctdb/tests/tool/ctdb.getpid.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.getpid.001.sh
diff --git a/ctdb/tests/tool/ctdb.getreclock.001.sh b/ctdb/tests/UNIT/tool/ctdb.getreclock.001.sh
index bfa08d06e51..bfa08d06e51 100755
--- a/ctdb/tests/tool/ctdb.getreclock.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.getreclock.001.sh
diff --git a/ctdb/tests/tool/ctdb.getreclock.002.sh b/ctdb/tests/UNIT/tool/ctdb.getreclock.002.sh
index 6543f8f6534..6543f8f6534 100755
--- a/ctdb/tests/tool/ctdb.getreclock.002.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.getreclock.002.sh
diff --git a/ctdb/tests/tool/ctdb.getvar.001.sh b/ctdb/tests/UNIT/tool/ctdb.getvar.001.sh
index 480788ada07..480788ada07 100755
--- a/ctdb/tests/tool/ctdb.getvar.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.getvar.001.sh
diff --git a/ctdb/tests/tool/ctdb.getvar.002.sh b/ctdb/tests/UNIT/tool/ctdb.getvar.002.sh
index c8aa302b768..c8aa302b768 100755
--- a/ctdb/tests/tool/ctdb.getvar.002.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.getvar.002.sh
diff --git a/ctdb/tests/tool/ctdb.ifaces.001.sh b/ctdb/tests/UNIT/tool/ctdb.ifaces.001.sh
index 5b9278765e1..5b9278765e1 100755
--- a/ctdb/tests/tool/ctdb.ifaces.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.ifaces.001.sh
diff --git a/ctdb/tests/tool/ctdb.ip.001.sh b/ctdb/tests/UNIT/tool/ctdb.ip.001.sh
index df0d1416295..df0d1416295 100755
--- a/ctdb/tests/tool/ctdb.ip.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.ip.001.sh
diff --git a/ctdb/tests/tool/ctdb.ip.002.sh b/ctdb/tests/UNIT/tool/ctdb.ip.002.sh
index 98a821fd1c6..98a821fd1c6 100755
--- a/ctdb/tests/tool/ctdb.ip.002.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.ip.002.sh
diff --git a/ctdb/tests/tool/ctdb.ip.003.sh b/ctdb/tests/UNIT/tool/ctdb.ip.003.sh
index eec46346c4a..eec46346c4a 100755
--- a/ctdb/tests/tool/ctdb.ip.003.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.ip.003.sh
diff --git a/ctdb/tests/tool/ctdb.ip.004.sh b/ctdb/tests/UNIT/tool/ctdb.ip.004.sh
index 53f090c4dd7..53f090c4dd7 100755
--- a/ctdb/tests/tool/ctdb.ip.004.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.ip.004.sh
diff --git a/ctdb/tests/tool/ctdb.ip.005.sh b/ctdb/tests/UNIT/tool/ctdb.ip.005.sh
index f84ac29a0f3..f84ac29a0f3 100755
--- a/ctdb/tests/tool/ctdb.ip.005.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.ip.005.sh
diff --git a/ctdb/tests/tool/ctdb.ip.006.sh b/ctdb/tests/UNIT/tool/ctdb.ip.006.sh
index 975a98c8d25..975a98c8d25 100755
--- a/ctdb/tests/tool/ctdb.ip.006.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.ip.006.sh
diff --git a/ctdb/tests/tool/ctdb.ip.007.sh b/ctdb/tests/UNIT/tool/ctdb.ip.007.sh
index cb7939d3507..cb7939d3507 100755
--- a/ctdb/tests/tool/ctdb.ip.007.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.ip.007.sh
diff --git a/ctdb/tests/tool/ctdb.ipinfo.001.sh b/ctdb/tests/UNIT/tool/ctdb.ipinfo.001.sh
index 60f9462f0fd..60f9462f0fd 100755
--- a/ctdb/tests/tool/ctdb.ipinfo.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.ipinfo.001.sh
diff --git a/ctdb/tests/tool/ctdb.ipinfo.002.sh b/ctdb/tests/UNIT/tool/ctdb.ipinfo.002.sh
index 366cfd69cbc..366cfd69cbc 100755
--- a/ctdb/tests/tool/ctdb.ipinfo.002.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.ipinfo.002.sh
diff --git a/ctdb/tests/tool/ctdb.ipinfo.003.sh b/ctdb/tests/UNIT/tool/ctdb.ipinfo.003.sh
index 383f1c71c36..383f1c71c36 100755
--- a/ctdb/tests/tool/ctdb.ipinfo.003.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.ipinfo.003.sh
diff --git a/ctdb/tests/tool/ctdb.listnodes.001.sh b/ctdb/tests/UNIT/tool/ctdb.listnodes.001.sh
index 5a494ee8c9e..5a494ee8c9e 100755
--- a/ctdb/tests/tool/ctdb.listnodes.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.listnodes.001.sh
diff --git a/ctdb/tests/tool/ctdb.listnodes.002.sh b/ctdb/tests/UNIT/tool/ctdb.listnodes.002.sh
index 95315d75b64..95315d75b64 100755
--- a/ctdb/tests/tool/ctdb.listnodes.002.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.listnodes.002.sh
diff --git a/ctdb/tests/tool/ctdb.listvars.001.sh b/ctdb/tests/UNIT/tool/ctdb.listvars.001.sh
index a304942af43..a304942af43 100755
--- a/ctdb/tests/tool/ctdb.listvars.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.listvars.001.sh
diff --git a/ctdb/tests/tool/ctdb.lvs.001.sh b/ctdb/tests/UNIT/tool/ctdb.lvs.001.sh
index 411072c5da4..411072c5da4 100755
--- a/ctdb/tests/tool/ctdb.lvs.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.lvs.001.sh
diff --git a/ctdb/tests/tool/ctdb.lvs.002.sh b/ctdb/tests/UNIT/tool/ctdb.lvs.002.sh
index 5344b166a4e..5344b166a4e 100755
--- a/ctdb/tests/tool/ctdb.lvs.002.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.lvs.002.sh
diff --git a/ctdb/tests/tool/ctdb.lvs.003.sh b/ctdb/tests/UNIT/tool/ctdb.lvs.003.sh
index c3d1f7221f1..c3d1f7221f1 100755
--- a/ctdb/tests/tool/ctdb.lvs.003.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.lvs.003.sh
diff --git a/ctdb/tests/tool/ctdb.lvs.004.sh b/ctdb/tests/UNIT/tool/ctdb.lvs.004.sh
index ea1d1887fe6..ea1d1887fe6 100755
--- a/ctdb/tests/tool/ctdb.lvs.004.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.lvs.004.sh
diff --git a/ctdb/tests/tool/ctdb.lvs.005.sh b/ctdb/tests/UNIT/tool/ctdb.lvs.005.sh
index 592224863ea..592224863ea 100755
--- a/ctdb/tests/tool/ctdb.lvs.005.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.lvs.005.sh
diff --git a/ctdb/tests/tool/ctdb.lvs.006.sh b/ctdb/tests/UNIT/tool/ctdb.lvs.006.sh
index 2f9859a6be8..2f9859a6be8 100755
--- a/ctdb/tests/tool/ctdb.lvs.006.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.lvs.006.sh
diff --git a/ctdb/tests/tool/ctdb.lvs.007.sh b/ctdb/tests/UNIT/tool/ctdb.lvs.007.sh
index dd47b9e69ca..dd47b9e69ca 100755
--- a/ctdb/tests/tool/ctdb.lvs.007.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.lvs.007.sh
diff --git a/ctdb/tests/tool/ctdb.lvs.008.sh b/ctdb/tests/UNIT/tool/ctdb.lvs.008.sh
index 6cdd702c57c..6cdd702c57c 100755
--- a/ctdb/tests/tool/ctdb.lvs.008.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.lvs.008.sh
diff --git a/ctdb/tests/tool/ctdb.natgw.001.sh b/ctdb/tests/UNIT/tool/ctdb.natgw.001.sh
index b73ce24c986..b73ce24c986 100755
--- a/ctdb/tests/tool/ctdb.natgw.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.natgw.001.sh
diff --git a/ctdb/tests/tool/ctdb.natgw.002.sh b/ctdb/tests/UNIT/tool/ctdb.natgw.002.sh
index 259c8695e64..259c8695e64 100755
--- a/ctdb/tests/tool/ctdb.natgw.002.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.natgw.002.sh
diff --git a/ctdb/tests/tool/ctdb.natgw.003.sh b/ctdb/tests/UNIT/tool/ctdb.natgw.003.sh
index af48b48c622..af48b48c622 100755
--- a/ctdb/tests/tool/ctdb.natgw.003.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.natgw.003.sh
diff --git a/ctdb/tests/tool/ctdb.natgw.004.sh b/ctdb/tests/UNIT/tool/ctdb.natgw.004.sh
index 8e48dcf432f..8e48dcf432f 100755
--- a/ctdb/tests/tool/ctdb.natgw.004.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.natgw.004.sh
diff --git a/ctdb/tests/tool/ctdb.natgw.005.sh b/ctdb/tests/UNIT/tool/ctdb.natgw.005.sh
index ccb05e8d8af..ccb05e8d8af 100755
--- a/ctdb/tests/tool/ctdb.natgw.005.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.natgw.005.sh
diff --git a/ctdb/tests/tool/ctdb.natgw.006.sh b/ctdb/tests/UNIT/tool/ctdb.natgw.006.sh
index 0f194d81809..0f194d81809 100755
--- a/ctdb/tests/tool/ctdb.natgw.006.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.natgw.006.sh
diff --git a/ctdb/tests/tool/ctdb.natgw.007.sh b/ctdb/tests/UNIT/tool/ctdb.natgw.007.sh
index 9fdfc302f3b..9fdfc302f3b 100755
--- a/ctdb/tests/tool/ctdb.natgw.007.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.natgw.007.sh
diff --git a/ctdb/tests/tool/ctdb.natgw.008.sh b/ctdb/tests/UNIT/tool/ctdb.natgw.008.sh
index db204a51383..db204a51383 100755
--- a/ctdb/tests/tool/ctdb.natgw.008.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.natgw.008.sh
diff --git a/ctdb/tests/tool/ctdb.nodestatus.001.sh b/ctdb/tests/UNIT/tool/ctdb.nodestatus.001.sh
index 2217afcc0b9..2217afcc0b9 100755
--- a/ctdb/tests/tool/ctdb.nodestatus.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.nodestatus.001.sh
diff --git a/ctdb/tests/tool/ctdb.nodestatus.002.sh b/ctdb/tests/UNIT/tool/ctdb.nodestatus.002.sh
index c1706fd98e7..c1706fd98e7 100755
--- a/ctdb/tests/tool/ctdb.nodestatus.002.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.nodestatus.002.sh
diff --git a/ctdb/tests/tool/ctdb.nodestatus.003.sh b/ctdb/tests/UNIT/tool/ctdb.nodestatus.003.sh
index 5912e6501aa..5912e6501aa 100755
--- a/ctdb/tests/tool/ctdb.nodestatus.003.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.nodestatus.003.sh
diff --git a/ctdb/tests/tool/ctdb.nodestatus.004.sh b/ctdb/tests/UNIT/tool/ctdb.nodestatus.004.sh
index 01ccd5129b4..01ccd5129b4 100755
--- a/ctdb/tests/tool/ctdb.nodestatus.004.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.nodestatus.004.sh
diff --git a/ctdb/tests/tool/ctdb.nodestatus.005.sh b/ctdb/tests/UNIT/tool/ctdb.nodestatus.005.sh
index 0cd24ba9cab..0cd24ba9cab 100755
--- a/ctdb/tests/tool/ctdb.nodestatus.005.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.nodestatus.005.sh
diff --git a/ctdb/tests/tool/ctdb.nodestatus.006.sh b/ctdb/tests/UNIT/tool/ctdb.nodestatus.006.sh
index ec189fc4690..ec189fc4690 100755
--- a/ctdb/tests/tool/ctdb.nodestatus.006.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.nodestatus.006.sh
diff --git a/ctdb/tests/tool/ctdb.pdelete.001.sh b/ctdb/tests/UNIT/tool/ctdb.pdelete.001.sh
index c0b7c17ac31..c0b7c17ac31 100755
--- a/ctdb/tests/tool/ctdb.pdelete.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.pdelete.001.sh
diff --git a/ctdb/tests/tool/ctdb.ping.001.sh b/ctdb/tests/UNIT/tool/ctdb.ping.001.sh
index 1e6d7c1808c..1e6d7c1808c 100755
--- a/ctdb/tests/tool/ctdb.ping.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.ping.001.sh
diff --git a/ctdb/tests/tool/ctdb.pnn.001.sh b/ctdb/tests/UNIT/tool/ctdb.pnn.001.sh
index a492071aca0..a492071aca0 100755
--- a/ctdb/tests/tool/ctdb.pnn.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.pnn.001.sh
diff --git a/ctdb/tests/tool/ctdb.process-exists.001.sh b/ctdb/tests/UNIT/tool/ctdb.process-exists.001.sh
index 1b6d213b3ad..1b6d213b3ad 100755
--- a/ctdb/tests/tool/ctdb.process-exists.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.process-exists.001.sh
diff --git a/ctdb/tests/tool/ctdb.process-exists.002.sh b/ctdb/tests/UNIT/tool/ctdb.process-exists.002.sh
index ace77493565..ace77493565 100755
--- a/ctdb/tests/tool/ctdb.process-exists.002.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.process-exists.002.sh
diff --git a/ctdb/tests/tool/ctdb.process-exists.003.sh b/ctdb/tests/UNIT/tool/ctdb.process-exists.003.sh
index 29c42a1a627..29c42a1a627 100755
--- a/ctdb/tests/tool/ctdb.process-exists.003.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.process-exists.003.sh
diff --git a/ctdb/tests/tool/ctdb.pstore.001.sh b/ctdb/tests/UNIT/tool/ctdb.pstore.001.sh
index 393b5a9891f..393b5a9891f 100755
--- a/ctdb/tests/tool/ctdb.pstore.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.pstore.001.sh
diff --git a/ctdb/tests/tool/ctdb.ptrans.001.sh b/ctdb/tests/UNIT/tool/ctdb.ptrans.001.sh
index 40ef1a2d2d4..40ef1a2d2d4 100755
--- a/ctdb/tests/tool/ctdb.ptrans.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.ptrans.001.sh
diff --git a/ctdb/tests/tool/ctdb.readkey.001.sh b/ctdb/tests/UNIT/tool/ctdb.readkey.001.sh
index e2c58fd3843..e2c58fd3843 100755
--- a/ctdb/tests/tool/ctdb.readkey.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.readkey.001.sh
diff --git a/ctdb/tests/tool/ctdb.recmaster.001.sh b/ctdb/tests/UNIT/tool/ctdb.recmaster.001.sh
index 28553046703..28553046703 100755
--- a/ctdb/tests/tool/ctdb.recmaster.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.recmaster.001.sh
diff --git a/ctdb/tests/tool/ctdb.recmaster.002.sh b/ctdb/tests/UNIT/tool/ctdb.recmaster.002.sh
index 93a9dafcfe5..93a9dafcfe5 100755
--- a/ctdb/tests/tool/ctdb.recmaster.002.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.recmaster.002.sh
diff --git a/ctdb/tests/tool/ctdb.recover.001.sh b/ctdb/tests/UNIT/tool/ctdb.recover.001.sh
index 15e05ca0cb5..15e05ca0cb5 100755
--- a/ctdb/tests/tool/ctdb.recover.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.recover.001.sh
diff --git a/ctdb/tests/tool/ctdb.reloadnodes.001.sh b/ctdb/tests/UNIT/tool/ctdb.reloadnodes.001.sh
index 68d6cfb5b3b..68d6cfb5b3b 100755
--- a/ctdb/tests/tool/ctdb.reloadnodes.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.reloadnodes.001.sh
diff --git a/ctdb/tests/tool/ctdb.reloadnodes.002.sh b/ctdb/tests/UNIT/tool/ctdb.reloadnodes.002.sh
index 570786d4e78..570786d4e78 100755
--- a/ctdb/tests/tool/ctdb.reloadnodes.002.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.reloadnodes.002.sh
diff --git a/ctdb/tests/tool/ctdb.reloadnodes.003.sh b/ctdb/tests/UNIT/tool/ctdb.reloadnodes.003.sh
index 99974d072dd..99974d072dd 100755
--- a/ctdb/tests/tool/ctdb.reloadnodes.003.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.reloadnodes.003.sh
diff --git a/ctdb/tests/tool/ctdb.reloadnodes.011.sh b/ctdb/tests/UNIT/tool/ctdb.reloadnodes.011.sh
index 261962e97e2..261962e97e2 100755
--- a/ctdb/tests/tool/ctdb.reloadnodes.011.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.reloadnodes.011.sh
diff --git a/ctdb/tests/tool/ctdb.reloadnodes.012.sh b/ctdb/tests/UNIT/tool/ctdb.reloadnodes.012.sh
index c3ca0fe3911..c3ca0fe3911 100755
--- a/ctdb/tests/tool/ctdb.reloadnodes.012.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.reloadnodes.012.sh
diff --git a/ctdb/tests/tool/ctdb.reloadnodes.013.sh b/ctdb/tests/UNIT/tool/ctdb.reloadnodes.013.sh
index 1402b9dcb6d..1402b9dcb6d 100755
--- a/ctdb/tests/tool/ctdb.reloadnodes.013.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.reloadnodes.013.sh
diff --git a/ctdb/tests/tool/ctdb.reloadnodes.014.sh b/ctdb/tests/UNIT/tool/ctdb.reloadnodes.014.sh
index 30e51485b6f..30e51485b6f 100755
--- a/ctdb/tests/tool/ctdb.reloadnodes.014.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.reloadnodes.014.sh
diff --git a/ctdb/tests/tool/ctdb.reloadnodes.015.sh b/ctdb/tests/UNIT/tool/ctdb.reloadnodes.015.sh
index 5fad9ded590..5fad9ded590 100755
--- a/ctdb/tests/tool/ctdb.reloadnodes.015.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.reloadnodes.015.sh
diff --git a/ctdb/tests/tool/ctdb.reloadnodes.016.sh b/ctdb/tests/UNIT/tool/ctdb.reloadnodes.016.sh
index d444a46c85f..d444a46c85f 100755
--- a/ctdb/tests/tool/ctdb.reloadnodes.016.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.reloadnodes.016.sh
diff --git a/ctdb/tests/tool/ctdb.reloadnodes.017.sh b/ctdb/tests/UNIT/tool/ctdb.reloadnodes.017.sh
index b9a969410f6..b9a969410f6 100755
--- a/ctdb/tests/tool/ctdb.reloadnodes.017.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.reloadnodes.017.sh
diff --git a/ctdb/tests/tool/ctdb.reloadnodes.018.sh b/ctdb/tests/UNIT/tool/ctdb.reloadnodes.018.sh
index 30be5961552..30be5961552 100755
--- a/ctdb/tests/tool/ctdb.reloadnodes.018.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.reloadnodes.018.sh
diff --git a/ctdb/tests/tool/ctdb.reloadnodes.019.sh b/ctdb/tests/UNIT/tool/ctdb.reloadnodes.019.sh
index 5069485b811..5069485b811 100755
--- a/ctdb/tests/tool/ctdb.reloadnodes.019.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.reloadnodes.019.sh
diff --git a/ctdb/tests/tool/ctdb.reloadnodes.020.sh b/ctdb/tests/UNIT/tool/ctdb.reloadnodes.020.sh
index 66384c935bb..66384c935bb 100755
--- a/ctdb/tests/tool/ctdb.reloadnodes.020.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.reloadnodes.020.sh
diff --git a/ctdb/tests/tool/ctdb.reloadnodes.021.sh b/ctdb/tests/UNIT/tool/ctdb.reloadnodes.021.sh
index 0f5f0d58d46..0f5f0d58d46 100755
--- a/ctdb/tests/tool/ctdb.reloadnodes.021.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.reloadnodes.021.sh
diff --git a/ctdb/tests/tool/ctdb.reloadnodes.023.sh b/ctdb/tests/UNIT/tool/ctdb.reloadnodes.023.sh
index b3823d30be4..b3823d30be4 100755
--- a/ctdb/tests/tool/ctdb.reloadnodes.023.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.reloadnodes.023.sh
diff --git a/ctdb/tests/tool/ctdb.reloadnodes.024.sh b/ctdb/tests/UNIT/tool/ctdb.reloadnodes.024.sh
index 9aa0d4255e6..9aa0d4255e6 100755
--- a/ctdb/tests/tool/ctdb.reloadnodes.024.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.reloadnodes.024.sh
diff --git a/ctdb/tests/tool/ctdb.runstate.001.sh b/ctdb/tests/UNIT/tool/ctdb.runstate.001.sh
index d9559bdaf2e..d9559bdaf2e 100755
--- a/ctdb/tests/tool/ctdb.runstate.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.runstate.001.sh
diff --git a/ctdb/tests/tool/ctdb.runstate.002.sh b/ctdb/tests/UNIT/tool/ctdb.runstate.002.sh
index b75b2ecd2ce..b75b2ecd2ce 100755
--- a/ctdb/tests/tool/ctdb.runstate.002.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.runstate.002.sh
diff --git a/ctdb/tests/tool/ctdb.runstate.003.sh b/ctdb/tests/UNIT/tool/ctdb.runstate.003.sh
index eba41f8ce30..eba41f8ce30 100755
--- a/ctdb/tests/tool/ctdb.runstate.003.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.runstate.003.sh
diff --git a/ctdb/tests/tool/ctdb.runstate.004.sh b/ctdb/tests/UNIT/tool/ctdb.runstate.004.sh
index 666e84d5c30..666e84d5c30 100755
--- a/ctdb/tests/tool/ctdb.runstate.004.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.runstate.004.sh
diff --git a/ctdb/tests/tool/ctdb.runstate.005.sh b/ctdb/tests/UNIT/tool/ctdb.runstate.005.sh
index 972783c39e0..972783c39e0 100755
--- a/ctdb/tests/tool/ctdb.runstate.005.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.runstate.005.sh
diff --git a/ctdb/tests/tool/ctdb.setdbreadonly.001.sh b/ctdb/tests/UNIT/tool/ctdb.setdbreadonly.001.sh
index 0a0cfe2c922..0a0cfe2c922 100755
--- a/ctdb/tests/tool/ctdb.setdbreadonly.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.setdbreadonly.001.sh
diff --git a/ctdb/tests/tool/ctdb.setdbreadonly.002.sh b/ctdb/tests/UNIT/tool/ctdb.setdbreadonly.002.sh
index 246fb60503b..246fb60503b 100755
--- a/ctdb/tests/tool/ctdb.setdbreadonly.002.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.setdbreadonly.002.sh
diff --git a/ctdb/tests/tool/ctdb.setdbreadonly.003.sh b/ctdb/tests/UNIT/tool/ctdb.setdbreadonly.003.sh
index 3a11c791c05..3a11c791c05 100755
--- a/ctdb/tests/tool/ctdb.setdbreadonly.003.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.setdbreadonly.003.sh
diff --git a/ctdb/tests/tool/ctdb.setdbreadonly.004.sh b/ctdb/tests/UNIT/tool/ctdb.setdbreadonly.004.sh
index 5d6561dca02..5d6561dca02 100755
--- a/ctdb/tests/tool/ctdb.setdbreadonly.004.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.setdbreadonly.004.sh
diff --git a/ctdb/tests/tool/ctdb.setdbreadonly.005.sh b/ctdb/tests/UNIT/tool/ctdb.setdbreadonly.005.sh
index ae336dd8bac..ae336dd8bac 100755
--- a/ctdb/tests/tool/ctdb.setdbreadonly.005.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.setdbreadonly.005.sh
diff --git a/ctdb/tests/tool/ctdb.setdbsticky.001.sh b/ctdb/tests/UNIT/tool/ctdb.setdbsticky.001.sh
index 28cbfd747b6..28cbfd747b6 100755
--- a/ctdb/tests/tool/ctdb.setdbsticky.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.setdbsticky.001.sh
diff --git a/ctdb/tests/tool/ctdb.setdbsticky.002.sh b/ctdb/tests/UNIT/tool/ctdb.setdbsticky.002.sh
index 1c39f54b221..1c39f54b221 100755
--- a/ctdb/tests/tool/ctdb.setdbsticky.002.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.setdbsticky.002.sh
diff --git a/ctdb/tests/tool/ctdb.setdbsticky.003.sh b/ctdb/tests/UNIT/tool/ctdb.setdbsticky.003.sh
index 206fed94fd3..206fed94fd3 100755
--- a/ctdb/tests/tool/ctdb.setdbsticky.003.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.setdbsticky.003.sh
diff --git a/ctdb/tests/tool/ctdb.setdbsticky.004.sh b/ctdb/tests/UNIT/tool/ctdb.setdbsticky.004.sh
index a322a57b923..a322a57b923 100755
--- a/ctdb/tests/tool/ctdb.setdbsticky.004.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.setdbsticky.004.sh
diff --git a/ctdb/tests/tool/ctdb.setdbsticky.005.sh b/ctdb/tests/UNIT/tool/ctdb.setdbsticky.005.sh
index 9a9bec1bd58..9a9bec1bd58 100755
--- a/ctdb/tests/tool/ctdb.setdbsticky.005.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.setdbsticky.005.sh
diff --git a/ctdb/tests/tool/ctdb.setdebug.001.sh b/ctdb/tests/UNIT/tool/ctdb.setdebug.001.sh
index bec32a334ea..bec32a334ea 100755
--- a/ctdb/tests/tool/ctdb.setdebug.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.setdebug.001.sh
diff --git a/ctdb/tests/tool/ctdb.setdebug.002.sh b/ctdb/tests/UNIT/tool/ctdb.setdebug.002.sh
index 7819b0b450a..7819b0b450a 100755
--- a/ctdb/tests/tool/ctdb.setdebug.002.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.setdebug.002.sh
diff --git a/ctdb/tests/tool/ctdb.setdebug.003.sh b/ctdb/tests/UNIT/tool/ctdb.setdebug.003.sh
index 2a8be1892da..2a8be1892da 100755
--- a/ctdb/tests/tool/ctdb.setdebug.003.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.setdebug.003.sh
diff --git a/ctdb/tests/tool/ctdb.setifacelink.001.sh b/ctdb/tests/UNIT/tool/ctdb.setifacelink.001.sh
index 53104cfc1b1..53104cfc1b1 100755
--- a/ctdb/tests/tool/ctdb.setifacelink.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.setifacelink.001.sh
diff --git a/ctdb/tests/tool/ctdb.setifacelink.002.sh b/ctdb/tests/UNIT/tool/ctdb.setifacelink.002.sh
index a27062ed055..a27062ed055 100755
--- a/ctdb/tests/tool/ctdb.setifacelink.002.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.setifacelink.002.sh
diff --git a/ctdb/tests/tool/ctdb.setvar.001.sh b/ctdb/tests/UNIT/tool/ctdb.setvar.001.sh
index e11ff9c8205..e11ff9c8205 100755
--- a/ctdb/tests/tool/ctdb.setvar.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.setvar.001.sh
diff --git a/ctdb/tests/tool/ctdb.setvar.002.sh b/ctdb/tests/UNIT/tool/ctdb.setvar.002.sh
index bf788a27fca..bf788a27fca 100755
--- a/ctdb/tests/tool/ctdb.setvar.002.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.setvar.002.sh
diff --git a/ctdb/tests/tool/ctdb.status.001.sh b/ctdb/tests/UNIT/tool/ctdb.status.001.sh
index 13324ef0dd9..13324ef0dd9 100755
--- a/ctdb/tests/tool/ctdb.status.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.status.001.sh
diff --git a/ctdb/tests/tool/ctdb.status.002.sh b/ctdb/tests/UNIT/tool/ctdb.status.002.sh
index 3fd8d1cf711..3fd8d1cf711 100755
--- a/ctdb/tests/tool/ctdb.status.002.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.status.002.sh
diff --git a/ctdb/tests/tool/ctdb.stop.001.sh b/ctdb/tests/UNIT/tool/ctdb.stop.001.sh
index d374ebf946d..d374ebf946d 100755
--- a/ctdb/tests/tool/ctdb.stop.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.stop.001.sh
diff --git a/ctdb/tests/tool/ctdb.stop.002.sh b/ctdb/tests/UNIT/tool/ctdb.stop.002.sh
index f8cc79299c5..f8cc79299c5 100755
--- a/ctdb/tests/tool/ctdb.stop.002.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.stop.002.sh
diff --git a/ctdb/tests/tool/ctdb.stop.003.sh b/ctdb/tests/UNIT/tool/ctdb.stop.003.sh
index 3e4981c0f05..3e4981c0f05 100755
--- a/ctdb/tests/tool/ctdb.stop.003.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.stop.003.sh
diff --git a/ctdb/tests/tool/ctdb.unban.001.sh b/ctdb/tests/UNIT/tool/ctdb.unban.001.sh
index c771fb4d199..c771fb4d199 100755
--- a/ctdb/tests/tool/ctdb.unban.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.unban.001.sh
diff --git a/ctdb/tests/tool/ctdb.unban.002.sh b/ctdb/tests/UNIT/tool/ctdb.unban.002.sh
index b65143d4a3b..b65143d4a3b 100755
--- a/ctdb/tests/tool/ctdb.unban.002.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.unban.002.sh
diff --git a/ctdb/tests/tool/ctdb.unban.003.sh b/ctdb/tests/UNIT/tool/ctdb.unban.003.sh
index 8b94f3011ba..8b94f3011ba 100755
--- a/ctdb/tests/tool/ctdb.unban.003.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.unban.003.sh
diff --git a/ctdb/tests/tool/ctdb.uptime.001.sh b/ctdb/tests/UNIT/tool/ctdb.uptime.001.sh
index 34fd1f4ebd7..34fd1f4ebd7 100755
--- a/ctdb/tests/tool/ctdb.uptime.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.uptime.001.sh
diff --git a/ctdb/tests/tool/ctdb.writekey.001.sh b/ctdb/tests/UNIT/tool/ctdb.writekey.001.sh
index 7adee9fb98d..7adee9fb98d 100755
--- a/ctdb/tests/tool/ctdb.writekey.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.writekey.001.sh
diff --git a/ctdb/tests/tool/scripts/local.sh b/ctdb/tests/UNIT/tool/scripts/local.sh
index 61313504f11..61313504f11 100644
--- a/ctdb/tests/tool/scripts/local.sh
+++ b/ctdb/tests/UNIT/tool/scripts/local.sh
diff --git a/ctdb/tests/run_tests.sh b/ctdb/tests/run_tests.sh
index 1b96da528eb..737a9dc60d9 100755
--- a/ctdb/tests/run_tests.sh
+++ b/ctdb/tests/run_tests.sh
@@ -310,7 +310,7 @@ unit_tests="
 	UNIT/shellcheck
 	UNIT/takeover
 	UNIT/takeover_helper
-	tool
+	UNIT/tool
 "
 
 # If no tests specified then run some defaults