diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-04-29 07:47:57 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-29 08:01:48 +1000 |
| commit | 4a87ca2028fe301d1d61e5cd365df49ff1f2dd22 (patch) | |
| tree | ae8ec6fddf5d778652fd26e4e0683e9cd7753721 | |
| parent | 08c3ce25c6d0571c6271645ef4dae3c5ca2b0e33 (diff) | |
| download | samba-4a87ca2028fe301d1d61e5cd365df49ff1f2dd22.tar.gz samba-4a87ca2028fe301d1d61e5cd365df49ff1f2dd22.tar.bz2 samba-4a87ca2028fe301d1d61e5cd365df49ff1f2dd22.zip | |
s4-waf: added --enable-build-farm configure option
this adds a smbtorture.static binary which s3 will use in the build
farm
| -rw-r--r-- | source4/torture/wscript_build | 29 | ||||
| -rw-r--r-- | source4/wscript | 9 |
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 |