autobuild: Remove unsupported --enable-socket-wrapper option from the "ctdb" target.

Socket wrapper now works with LD_PRELOAD.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Michael Adam <obnox@samba.org>

diff --git a/ctdb/wscript b/ctdb/wscript
index 26730981a3789a4530488f5d2529d70816c7ba30..f69bf580f71ed03d699e6648d3015235ea99f3e8 100755 (executable)
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -520,7 +520,7 @@ def test(ctx):
     Scripting.commands.append('testonly')
 
 def autotest(ctx):
-    cmd = 'tests/run_tests.sh -e -S -C'
+    cmd = 'LD_PRELOAD=bin/shared/libsocket-wrapper.so tests/run_tests.sh -e -S -C'
     samba_utils.RUN_COMMAND(cmd)
 
 def dist():

diff --git a/script/autobuild.py b/script/autobuild.py
index 340028ed490eea656fd5eeee5bef5163e8393beb..9ebdf2bc27cd8fed45a158b9a59f899ef865592c 100755 (executable)
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -36,7 +36,7 @@ defaulttasks = [ "ctdb", "samba", "samba-ctdb", "samba-libs", "ldb", "tdb", "ntd
 
 tasks = {
     "ctdb" : [ ("random-sleep", "../script/random-sleep.sh 60 600", "text/plain"),
-               ("configure", "./configure ${PREFIX} --enable-socket-wrapper ", "text/plain"),
+               ("configure", "./configure ${PREFIX}", "text/plain"),
                ("make", "make all", "text/plain"),
                ("install", "make install", "text/plain"),
                ("test", "make autotest", "text/plain"),