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

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

Resolved conflict while cherry-picking this:

  Don't take the eventscripts files for this branch.  We'll put them
  elsewhere.

Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit a9879e37d4e3bb714ef6c0c4144c6949daec0b53)

diff --git a/ctdb/tests/onnode/README b/ctdb/tests/onnode/README
index 1bbf7af5a59dc7c9b6014d025ffcda569fb65c28..58943d3845f95d10d5e5ab0a1e215615005f7ee5 100644 (file)
--- a/ctdb/tests/onnode/README
+++ b/ctdb/tests/onnode/README
@@ -17,7 +17,7 @@ Examples:
 
 * ONNODE=onnode-buggy-001 ./run_tests.sh -s
 
-  Run against bin/onnode-buggy-001 instead of default onnode version.
+  Run against stubs/onnode-buggy-001 instead of default onnode version.
 
   Add more buggy versions of onnode to this directory as bugs are
   fixed to enable test validation using this feature.
@@ -26,7 +26,7 @@ Examples:
 
   Run only the specified tests.
 
-* ONNODE="bash -x bin/onnode-buggy-001" ./run_tests.sh ./0090.sh
+* ONNODE="bash -x stubs/onnode-buggy-001" ./run_tests.sh ./0090.sh
   ONNODE="bash -x ../../tools/onnode" ./run_tests.sh ./0090.sh
 
   Debug the specified test or test failure.  The test will fail

diff --git a/ctdb/tests/onnode/common.sh b/ctdb/tests/onnode/common.sh
index e4cca321627e846c963521bdc4257ed43fe9d15c..f920bc398a687cdebf3a6863d797df4a5425d450 100644 (file)
--- a/ctdb/tests/onnode/common.sh
+++ b/ctdb/tests/onnode/common.sh
@@ -6,10 +6,10 @@ unset CTDB_NODES_SOCKETS
 # Default to just "onnode".
 : ${ONNODE:=onnode}
 
-# Augment PATH with relevant bin/ directories.
+# Augment PATH with relevant stubs/ directories.
 
-if [ -d "${ONNODE_TESTS_DIR}/bin" ] ; then
-    PATH="${ONNODE_TESTS_DIR}/bin:$PATH"
+if [ -d "${ONNODE_TESTS_DIR}/stubs" ] ; then
+    PATH="${ONNODE_TESTS_DIR}/stubs:$PATH"
 fi
 
 export ONNODE_TESTCASE_DIR=$(dirname "$0")
@@ -17,8 +17,8 @@ if [ $(basename "$ONNODE_TESTCASE_DIR") = "onnode" ] ; then
     # Just a test script, no testcase subdirectory.
     ONNODE_TESTCASE_DIR="$ONNODE_TESTS_DIR"
 else
-    if [ -d "${ONNODE_TESTCASE_DIR}/bin" ] ; then
-       PATH="${ONNODE_TESTCASE_DIR}/bin:$PATH"
+    if [ -d "${ONNODE_TESTCASE_DIR}/stubs" ] ; then
+       PATH="${ONNODE_TESTCASE_DIR}/stubs:$PATH"
     fi
 fi
 

diff --git a/ctdb/tests/onnode/bin/ctdb b/ctdb/tests/onnode/stubs/ctdb
similarity index 100%
rename from ctdb/tests/onnode/bin/ctdb
rename to ctdb/tests/onnode/stubs/ctdb

diff --git a/ctdb/tests/onnode/bin/onnode-buggy-001 b/ctdb/tests/onnode/stubs/onnode-buggy-001
similarity index 100%
rename from ctdb/tests/onnode/bin/onnode-buggy-001
rename to ctdb/tests/onnode/stubs/onnode-buggy-001

diff --git a/ctdb/tests/onnode/bin/ssh b/ctdb/tests/onnode/stubs/ssh
similarity index 100%
rename from ctdb/tests/onnode/bin/ssh
rename to ctdb/tests/onnode/stubs/ssh