summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-10-22 09:38:22 +0200
committerStefan Metzmacher <metze@samba.org>2011-10-22 13:15:52 +0200
commit6b06b0d3b4971107b561a818c627a11021ef5812 (patch)
tree178ef0ac4c1aa1b12fc4d09227e09c3737d7dd8f
parentc2b5106387f2fcfa2d789f40d492d53e6c978076 (diff)
downloadsamba-6b06b0d3b4971107b561a818c627a11021ef5812.tar.gz
samba-6b06b0d3b4971107b561a818c627a11021ef5812.tar.bz2
samba-6b06b0d3b4971107b561a818c627a11021ef5812.zip
talloc: simplifiy the logic to build talloc_testsuite in the standalone build
metze Autobuild-User: Stefan Metzmacher <metze@samba.org> Autobuild-Date: Sat Oct 22 13:15:52 CEST 2011 on sn-devel-104
-rw-r--r--lib/talloc/wscript14
1 files changed, 6 insertions, 8 deletions
diff --git a/lib/talloc/wscript b/lib/talloc/wscript
index 2340152efc..dd83e16a42 100644
--- a/lib/talloc/wscript
+++ b/lib/talloc/wscript
@@ -84,6 +84,12 @@ def build(bld):
pc_files=[],
public_headers=[],
enabled=bld.env.TALLOC_COMPAT1)
+
+ bld.SAMBA_BINARY('talloc_testsuite',
+ 'testsuite_main.c testsuite.c',
+ deps='talloc',
+ install=False)
+
else:
private_library = True
@@ -121,14 +127,6 @@ def build(bld):
enabled=True,
realname='talloc.so')
- if not getattr(bld.env, '_SAMBA_BUILD_', 0) == 4:
- # s4 already has the talloc testsuite builtin to smbtorture
- bld.SAMBA_BINARY('talloc_testsuite',
- 'testsuite_main.c testsuite.c',
- deps='talloc',
- install=False)
-
-
def test(ctx):
'''run talloc testsuite'''
import Utils, samba_utils