From 6b06b0d3b4971107b561a818c627a11021ef5812 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Sat, 22 Oct 2011 09:38:22 +0200
Subject: 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
---
 lib/talloc/wscript | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'lib')

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
-- 
cgit