build: Remove special case for the build farm

Except in the formatting of the selftest output, this removes the special case
of the build farm, so that an autobuild, a manual make test and the build farm
are more similar.

Andrew Bartlett

Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Tue Aug 21 06:39:04 CEST 2012 on sn-devel-104

1 files changed, 0 insertions, 6 deletions

diff --git a/wscript b/wscript
index 159c486229..3667a8db34 100755
--- a/wscript
+++ b/wscript
@@ -57,9 +57,6 @@ def set_options(opt):
                    action='store_true', dest='without_ad_dc', default=False)
 
     gr = opt.option_group('developer options')
-    gr.add_option('--enable-build-farm',
-                   help='enable special build farm options',
-                   action='store_true', dest='BUILD_FARM')
 
     opt.add_option('--disable-ntdb',
                    help=("disable ntdb"),
@@ -81,9 +78,6 @@ def configure(conf):
         conf.ADD_CFLAGS('-DDEVELOPER -DDEBUG_PASSWORD')
         conf.env.DEVELOPER = True
 
-    # 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')
-
     conf.ADD_EXTRA_INCLUDES('#include/public #source4 #lib #source4/lib #source4/include #include #lib/replace')
 
     conf.RECURSE('lib/replace')