diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2014-06-17 09:24:48 -0700 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2014-06-20 23:38:10 +0200 |
| commit | 46924f68c1db00a402b419b4f3c71d60d473ea77 (patch) | |
| tree | 534565f90640c77c500c7bb513589845a47d878e | |
| parent | 659a665de8707b28ea081812fc752d0cf1c9822f (diff) | |
| download | samba-46924f68c1db00a402b419b4f3c71d60d473ea77.tar.gz samba-46924f68c1db00a402b419b4f3c71d60d473ea77.tar.xz samba-46924f68c1db00a402b419b4f3c71d60d473ea77.zip | |
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>
| -rwxr-xr-x | ctdb/wscript | 2 | ||||
| -rwxr-xr-x | script/autobuild.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ctdb/wscript b/ctdb/wscript index 26730981a3..f69bf580f7 100755 --- 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 340028ed49..9ebdf2bc27 100755 --- 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"), |