ctdb-tests: Simplify test_wrap script

Given other improvements, this is now needlessly complex.

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

diff --git a/ctdb/tests/scripts/test_wrap b/ctdb/tests/scripts/test_wrap
index 3db3180ae98964264880bfc4b789bb923b4c9054..d9a6d09e202213f1992b2d5997131be351eb7c8d 100755 (executable)
--- a/ctdb/tests/scripts/test_wrap
+++ b/ctdb/tests/scripts/test_wrap
@@ -1,20 +1,10 @@
 #!/bin/bash
 
-# Execute the given command.  The intention is that it is a function
-# from "${TEST_SCRIPTS_DIR}/integration.bash".
+# Execute the given command.  The intention is that it is either
+# * a function from "${TEST_SCRIPTS_DIR}/integration.bash"; or
+# * a test helper binary
 
-PATH="$(dirname $0):${PATH}"
-
-TEST_SCRIPTS_DIR=$(dirname $0)
-
-# We need the test binaries (i.e. tests/bin/) to be in $PATH.  If they
-# aren't already in $PATH then we know that tests/bin/ sits alongside
-# tests/scripts/.
-f="fetch_ring"
-if [ ! $(which $f >/dev/null 2>&1) ] ; then
-    d=$(dirname "$TEST_SCRIPTS_DIR")/bin
-    [ -x "$d/$f" ] && PATH="$d:$PATH"
-fi
+TEST_SCRIPTS_DIR=$(dirname "$0")
 
 . "${TEST_SCRIPTS_DIR}/integration.bash"
 

diff --git a/ctdb/wscript b/ctdb/wscript
index 03e29e133d832ef21bea8e5dbaaf8af87a5d71b9..45207d5548ac0cb08d843971bfc29517d3801cc1 100644 (file)
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -1091,14 +1091,10 @@ def build(bld):
                           os.path.join('tests/scripts', t),
                           destname=os.path.join('scripts', t))
 
-    sed_expr = 's@^TEST_SCRIPTS_DIR=.*@&\\nexport TEST_BIN_DIR=\"%s\"@' % (
-               bld.env.CTDB_TEST_LIBEXECDIR)
-    bld.SAMBA_GENERATOR('ctdb-test-wrap',
-                        source='tests/scripts/test_wrap',
-                        target='test_wrap',
-                        rule='sed -e "%s" ${SRC} > ${TGT}' % sed_expr)
-    bld.INSTALL_FILES(bld.env.CTDB_TEST_DATADIR+"/scripts", 'test_wrap',
-                      destname='test_wrap', chmod=MODE_755)
+    bld.INSTALL_FILES(bld.env.CTDB_TEST_DATADIR,
+                      'tests/scripts/test_wrap',
+                      destname='scripts/test_wrap',
+                      chmod=MODE_755)
 
     bld.SAMBA_GENERATOR('ctdb-test-script-install-paths',
                         source='tests/scripts/script_install_paths.sh',