summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/torture/wscript_build29
-rw-r--r--source4/wscript9
2 files changed, 32 insertions, 6 deletions
diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build
index 220673af2b..33f9f15e73 100644
--- a/source4/torture/wscript_build
+++ b/source4/torture/wscript_build
@@ -131,13 +131,30 @@ bld.SAMBA_MODULE('TORTURE_NTP',
TORTURE_MODULES = 'TORTURE_BASIC TORTURE_RAW torture_rpc TORTURE_RAP TORTURE_AUTH TORTURE_NBENCH TORTURE_UNIX TORTURE_LDAP TORTURE_NBT TORTURE_NET TORTURE_NTP torture_registry'
+bld.SAMBA_SUBSYSTEM('torturemain',
+ source='smbtorture.c torture.c',
+ subsystem_name='smbtorture',
+ deps='torture popt POPT_SAMBA POPT_CREDENTIALS dcerpc LIBCLI_SMB SMBREADLINE ' + TORTURE_MODULES,
+ needs_python=True
+ )
+
bld.SAMBA_BINARY('smbtorture',
- source='smbtorture.c torture.c',
- manpages='man/smbtorture.1',
- public_headers='smbtorture.h',
- deps='torture popt POPT_SAMBA POPT_CREDENTIALS dcerpc LIBCLI_SMB SMBREADLINE ' + TORTURE_MODULES,
- needs_python=True
- )
+ source=[],
+ manpages='man/smbtorture.1',
+ public_headers='smbtorture.h',
+ deps='torturemain torture popt POPT_SAMBA POPT_CREDENTIALS dcerpc LIBCLI_SMB SMBREADLINE ' + TORTURE_MODULES,
+ needs_python=True
+ )
+
+# this is used in the build farm to build a smbtorture.static binary for s3
+bld.SAMBA_BINARY('smbtorture.static',
+ source=[],
+ deps='torturemain torture popt POPT_SAMBA POPT_CREDENTIALS dcerpc LIBCLI_SMB SMBREADLINE ' + TORTURE_MODULES,
+ enabled = bld.env.BUILD_FARM,
+ needs_python=True
+ )
+bld.env.NONSHARED_BINARIES.append('smbtorture.static')
+
bld.SAMBA_BINARY('gentest',
diff --git a/source4/wscript b/source4/wscript
index 4f8042db50..e5c8d23092 100644
--- a/source4/wscript
+++ b/source4/wscript
@@ -30,6 +30,12 @@ def set_options(opt):
opt.RECURSE('../lib/uid_wrapper')
opt.RECURSE('../pidl')
+ gr = opt.option_group('developer options')
+ gr.add_option('--enable-build-farm',
+ help='enable special build farm options',
+ action='store_true', dest='BUILD_FARM')
+
+
def configure(conf):
conf.DEFINE('PACKAGE_NAME', 'samba', quote=True)
conf.DEFINE('PACKAGE_STRING', 'samba 4', quote=True)
@@ -45,6 +51,9 @@ def configure(conf):
if Options.options.developer:
conf.ADD_CFLAGS('-DDEVELOPER -DDEBUG_PASSWORD')
+ # this enables smbtorture.static for s3 in the build farm
+ conf.env.BUILD_FARM = Options.options.BUILD_FARM or os.environ.get('RUN_FROM_BUILD_FARM')
+
# set a lower limit on recursing in waf preprocessor
conf.env.preprocessor_recursion_limit = 10