Tests: eventscripts and onnode tests use stubs/ subdirectory instead of bin/.

This sets up a more useful convention and avoids future .gitignore
problems.

Signed-off-by: Martin Schwenke <martin@meltin.net>

(This used to be ctdb commit 58c696dc600f1073e693930da061776b6fb199f2)

19 files changed, 5 insertions, 5 deletions

diff --git a/ctdb/tests/eventscripts/common.sh b/ctdb/tests/eventscripts/common.sh
index ec5454c18e..3e9076e79a 100644
--- a/ctdb/tests/eventscripts/common.sh
+++ b/ctdb/tests/eventscripts/common.sh
@@ -1,14 +1,14 @@
 # Hey Emacs, this is a -*- shell-script -*- !!!  :-)
 
-# Augment PATH with relevant bin/ directories.  We do this by actually
+# Augment PATH with relevant stubs/ directories.  We do this by actually
 # setting PATH, and also by setting $EVENTSCRIPTS_PATH and then
 # prepending that to $PATH in rc.local to avoid the PATH reset in
 # functions.
 
 EVENTSCRIPTS_PATH=""
 
-if [ -d "${EVENTSCRIPTS_TESTS_DIR}/bin" ] ; then
-    EVENTSCRIPTS_PATH="${EVENTSCRIPTS_TESTS_DIR}/bin"
+if [ -d "${EVENTSCRIPTS_TESTS_DIR}/stubs" ] ; then
+    EVENTSCRIPTS_PATH="${EVENTSCRIPTS_TESTS_DIR}/stubs"
 fi
 
 export EVENTSCRIPTS_TESTCASE_DIR=$(dirname "$0")
@@ -16,8 +16,8 @@ if [ $(basename "$EVENTSCRIPTS_TESTCASE_DIR") = "eventscripts" ] ; then
     # Just a test script, no testcase subdirectory.
     EVENTSCRIPTS_TESTCASE_DIR="$EVENTSCRIPTS_TESTS_DIR"
 else
-    if [ -d "${EVENTSCRIPTS_TESTCASE_DIR}/bin" ] ; then
-	EVENTSCRIPTS_PATH="${EVENTSCRIPTS_TESTCASE_DIR}/bin:${EVENTSCRIPTS_PATH}"
+    if [ -d "${EVENTSCRIPTS_TESTCASE_DIR}/stubs" ] ; then
+	EVENTSCRIPTS_PATH="${EVENTSCRIPTS_TESTCASE_DIR}/stubs:${EVENTSCRIPTS_PATH}"
     fi
 fi
 
diff --git a/ctdb/tests/eventscripts/bin/ctdb b/ctdb/tests/eventscripts/stubs/ctdb
index 296fede83a..296fede83a 100755
--- a/ctdb/tests/eventscripts/bin/ctdb
+++ b/ctdb/tests/eventscripts/stubs/ctdb
diff --git a/ctdb/tests/eventscripts/bin/ethtool b/ctdb/tests/eventscripts/stubs/ethtool
index bd173f438f..bd173f438f 100755
--- a/ctdb/tests/eventscripts/bin/ethtool
+++ b/ctdb/tests/eventscripts/stubs/ethtool
diff --git a/ctdb/tests/eventscripts/bin/exportfs b/ctdb/tests/eventscripts/stubs/exportfs
index e3859f901f..e3859f901f 100755
--- a/ctdb/tests/eventscripts/bin/exportfs
+++ b/ctdb/tests/eventscripts/stubs/exportfs
diff --git a/ctdb/tests/eventscripts/bin/ip b/ctdb/tests/eventscripts/stubs/ip
index 5e6a1e9275..5e6a1e9275 100755
--- a/ctdb/tests/eventscripts/bin/ip
+++ b/ctdb/tests/eventscripts/stubs/ip
diff --git a/ctdb/tests/eventscripts/bin/iptables b/ctdb/tests/eventscripts/stubs/iptables
index 2c65f7ba11..2c65f7ba11 100755
--- a/ctdb/tests/eventscripts/bin/iptables
+++ b/ctdb/tests/eventscripts/stubs/iptables
diff --git a/ctdb/tests/eventscripts/bin/kill b/ctdb/tests/eventscripts/stubs/kill
index b69e3e62a3..b69e3e62a3 100755
--- a/ctdb/tests/eventscripts/bin/kill
+++ b/ctdb/tests/eventscripts/stubs/kill
diff --git a/ctdb/tests/eventscripts/bin/killall b/ctdb/tests/eventscripts/stubs/killall
index 1e182e1e0d..1e182e1e0d 100755
--- a/ctdb/tests/eventscripts/bin/killall
+++ b/ctdb/tests/eventscripts/stubs/killall
diff --git a/ctdb/tests/eventscripts/bin/net b/ctdb/tests/eventscripts/stubs/net
index 3f96413313..3f96413313 100755
--- a/ctdb/tests/eventscripts/bin/net
+++ b/ctdb/tests/eventscripts/stubs/net
diff --git a/ctdb/tests/eventscripts/bin/netstat b/ctdb/tests/eventscripts/stubs/netstat
index cf0656651a..cf0656651a 100755
--- a/ctdb/tests/eventscripts/bin/netstat
+++ b/ctdb/tests/eventscripts/stubs/netstat
diff --git a/ctdb/tests/eventscripts/bin/pkill b/ctdb/tests/eventscripts/stubs/pkill
index b3f1de5a57..b3f1de5a57 100755
--- a/ctdb/tests/eventscripts/bin/pkill
+++ b/ctdb/tests/eventscripts/stubs/pkill
diff --git a/ctdb/tests/eventscripts/bin/rpc.lockd b/ctdb/tests/eventscripts/stubs/rpc.lockd
index e71f6cd8ff..e71f6cd8ff 100755
--- a/ctdb/tests/eventscripts/bin/rpc.lockd
+++ b/ctdb/tests/eventscripts/stubs/rpc.lockd
diff --git a/ctdb/tests/eventscripts/bin/rpc.mountd b/ctdb/tests/eventscripts/stubs/rpc.mountd
index e71f6cd8ff..e71f6cd8ff 100755
--- a/ctdb/tests/eventscripts/bin/rpc.mountd
+++ b/ctdb/tests/eventscripts/stubs/rpc.mountd
diff --git a/ctdb/tests/eventscripts/bin/rpc.rquotad b/ctdb/tests/eventscripts/stubs/rpc.rquotad
index e71f6cd8ff..e71f6cd8ff 100755
--- a/ctdb/tests/eventscripts/bin/rpc.rquotad
+++ b/ctdb/tests/eventscripts/stubs/rpc.rquotad
diff --git a/ctdb/tests/eventscripts/bin/rpc.statd b/ctdb/tests/eventscripts/stubs/rpc.statd
index e71f6cd8ff..e71f6cd8ff 100755
--- a/ctdb/tests/eventscripts/bin/rpc.statd
+++ b/ctdb/tests/eventscripts/stubs/rpc.statd
diff --git a/ctdb/tests/eventscripts/bin/rpcinfo b/ctdb/tests/eventscripts/stubs/rpcinfo
index dd175f3d9c..dd175f3d9c 100755
--- a/ctdb/tests/eventscripts/bin/rpcinfo
+++ b/ctdb/tests/eventscripts/stubs/rpcinfo
diff --git a/ctdb/tests/eventscripts/bin/service b/ctdb/tests/eventscripts/stubs/service
index 5f47b55e00..5f47b55e00 100755
--- a/ctdb/tests/eventscripts/bin/service
+++ b/ctdb/tests/eventscripts/stubs/service
diff --git a/ctdb/tests/eventscripts/bin/testparm b/ctdb/tests/eventscripts/stubs/testparm
index 83aa578673..83aa578673 100755
--- a/ctdb/tests/eventscripts/bin/testparm
+++ b/ctdb/tests/eventscripts/stubs/testparm
diff --git a/ctdb/tests/eventscripts/bin/wbinfo b/ctdb/tests/eventscripts/stubs/wbinfo
index 4fc6b98331..4fc6b98331 100755
--- a/ctdb/tests/eventscripts/bin/wbinfo
+++ b/ctdb/tests/eventscripts/stubs/wbinfo