From: Martin Schwenke Date: Mon, 9 Sep 2019 00:51:17 +0000 (+1000) Subject: ctdb-tests: Move tool tests to UNIT/ subdirectory X-Git-Tag: talloc-2.3.1~662 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1061bdf29dce60251a53dcc0623efb8815b144ae;p=thirdparty%2Fsamba.git ctdb-tests: Move tool tests to UNIT/ subdirectory Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- diff --git a/ctdb/tests/tool/README b/ctdb/tests/UNIT/tool/README similarity index 100% rename from ctdb/tests/tool/README rename to ctdb/tests/UNIT/tool/README diff --git a/ctdb/tests/tool/ctdb.attach.001.sh b/ctdb/tests/UNIT/tool/ctdb.attach.001.sh similarity index 100% rename from ctdb/tests/tool/ctdb.attach.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.attach.002.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.attach.003.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.ban.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.ban.002.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.ban.003.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.catdb.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.catdb.002.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.cattdb.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.cattdb.002.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.continue.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.continue.002.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.continue.003.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.deletekey.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.disable.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.disable.002.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.disable.003.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.disable.004.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.enable.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.enable.002.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.enable.003.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.getcapabilities.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.getcapabilities.002.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.getcapabilities.003.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.getcapabilities.004.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.getdbmap.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.getdbseqnum.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.getdbseqnum.002.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.getdbstatus.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.getdbstatus.002.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.getpid.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.getreclock.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.getreclock.002.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.getvar.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.getvar.002.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.ifaces.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.ip.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.ip.002.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.ip.003.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.ip.004.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.ip.005.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.ip.006.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.ip.007.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.ipinfo.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.ipinfo.002.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.ipinfo.003.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.listnodes.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.listnodes.002.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.listvars.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.lvs.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.lvs.002.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.lvs.003.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.lvs.004.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.lvs.005.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.lvs.006.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.lvs.007.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.lvs.008.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.natgw.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.natgw.002.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.natgw.003.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.natgw.004.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.natgw.005.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.natgw.006.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.natgw.007.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.natgw.008.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.nodestatus.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.nodestatus.002.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.nodestatus.003.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.nodestatus.004.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.nodestatus.005.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.nodestatus.006.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.pdelete.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.ping.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.pnn.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.process-exists.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.process-exists.002.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.process-exists.003.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.pstore.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.ptrans.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.readkey.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.recmaster.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.recmaster.002.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.recover.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.reloadnodes.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.reloadnodes.002.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.reloadnodes.003.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.reloadnodes.011.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.reloadnodes.012.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.reloadnodes.013.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.reloadnodes.014.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.reloadnodes.015.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.reloadnodes.016.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.reloadnodes.017.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.reloadnodes.018.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.reloadnodes.019.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.reloadnodes.020.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.reloadnodes.021.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.reloadnodes.023.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.reloadnodes.024.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.runstate.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.runstate.002.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.runstate.003.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.runstate.004.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.runstate.005.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.setdbreadonly.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.setdbreadonly.002.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.setdbreadonly.003.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.setdbreadonly.004.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.setdbreadonly.005.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.setdbsticky.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.setdbsticky.002.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.setdbsticky.003.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.setdbsticky.004.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.setdbsticky.005.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.setdebug.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.setdebug.002.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.setdebug.003.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.setifacelink.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.setifacelink.002.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.setvar.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.setvar.002.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.status.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.status.002.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.stop.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.stop.002.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.stop.003.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.unban.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.unban.002.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.unban.003.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.uptime.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/ctdb.writekey.001.sh rename to 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 similarity index 100% rename from ctdb/tests/tool/scripts/local.sh rename to 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 diff --git a/ctdb/wscript b/ctdb/wscript index d9a879a7166..9183e6c77ec 100644 --- a/ctdb/wscript +++ b/ctdb/wscript @@ -1051,8 +1051,7 @@ def build(bld): 'UNIT', 'complex', 'etc-ctdb', - 'simple', - 'tool' + 'simple' ] if bld.env.standalone_ctdb: