From f22e15d9d5a3d4744982265363c357ef277ba31e Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 21 Nov 2012 20:20:46 +1100
Subject: [PATCH] build: Do not install testing binaries

These binaries are for developer or selftest use, and are not
supported for installation onto the system.  The autoconf build does
not install these binaries, and so neither should the waf build.

Andrew Bartlett

Reviewed-by: Andreas Schneider <asn@samba.org>

Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Thu Nov 22 12:00:36 CET 2012 on sn-devel-104
---
 nsswitch/wscript_build                |    7 ++++---
 source3/lib/asys/wscript_build        |    3 ++-
 source3/lib/pthreadpool/wscript_build |    3 ++-
 source3/wscript_build                 |   16 ++++++++++++++++
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build
index a94c02c..1efee55 100644
--- a/nsswitch/wscript_build
+++ b/nsswitch/wscript_build
@@ -12,9 +12,10 @@ bld.SAMBA_LIBRARY('winbind-client',
 
 
 bld.SAMBA_BINARY('nsstest',
-	source='nsstest.c',
-	deps='replace dl'
-	)
+		 source='nsstest.c',
+		 deps='replace dl',
+                 install=False
+		 )
 
 # The nss_wrapper code relies strictly on the linux implementation and
 # name, so compile but do not install a copy under this name.
diff --git a/source3/lib/asys/wscript_build b/source3/lib/asys/wscript_build
index 7b6d236..15de977 100644
--- a/source3/lib/asys/wscript_build
+++ b/source3/lib/asys/wscript_build
@@ -6,4 +6,5 @@ bld.SAMBA3_SUBSYSTEM('LIBASYS',
 
 bld.SAMBA3_BINARY('asystest',
 		  source='tests.c',
-		  deps='LIBASYS')
+		  deps='LIBASYS',
+                  install=False)
diff --git a/source3/lib/pthreadpool/wscript_build b/source3/lib/pthreadpool/wscript_build
index 2cdd2ab..bdd5f53 100644
--- a/source3/lib/pthreadpool/wscript_build
+++ b/source3/lib/pthreadpool/wscript_build
@@ -13,4 +13,5 @@ else:
 bld.SAMBA3_BINARY('pthreadpooltest',
                   source='tests.c',
                   deps='PTHREADPOOL',
-                  enabled=bld.env.WITH_PTHREADPOOL)
+                  enabled=bld.env.WITH_PTHREADPOOL,
+                  install=False)
diff --git a/source3/wscript_build b/source3/wscript_build
index fc8496c..b87b4d1 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -1438,6 +1438,7 @@ bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3,
 		 NDR_OPEN_FILES
 		 idmap
                  ''',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_BINARY('smbconftort',
@@ -1446,6 +1447,7 @@ bld.SAMBA3_BINARY('smbconftort',
                  talloc
                  param
                  popt_samba3''',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_BINARY('replacetort',
@@ -1458,6 +1460,7 @@ bld.SAMBA3_BINARY('msgtest',
                  deps='''
                  talloc
                  param''',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_BINARY('smbcacls',
@@ -1503,6 +1506,7 @@ bld.SAMBA3_BINARY('pdbtest',
                  popt_samba3
                  AUTH_COMMON
                  auth''',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_BINARY('vfstest',
@@ -1511,11 +1515,13 @@ bld.SAMBA3_BINARY('vfstest',
                  vfs
                  popt_samba3
                  SMBREADLINE''',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_BINARY('log2pcap',
                  source=LOG2PCAP_SRC,
                  deps='''talloc popt''',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_BINARY('locktest2',
@@ -1525,11 +1531,13 @@ bld.SAMBA3_BINARY('locktest2',
                  param
                  libsmb
                  LOCKING''',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_BINARY('debug2html',
                  source=DEBUG2HTML_SRC,
                  deps='''talloc popt''',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_BINARY('smbfilter',
@@ -1538,6 +1546,7 @@ bld.SAMBA3_BINARY('smbfilter',
                  talloc
                  param
                  LIBNMB''',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_BINARY('versiontest',
@@ -1545,6 +1554,7 @@ bld.SAMBA3_BINARY('versiontest',
                  deps='''
                  SAMBA_VERSION
                  param''',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_BINARY('ntlm_auth',
@@ -1560,6 +1570,7 @@ bld.SAMBA3_BINARY('ntlm_auth',
 
 bld.SAMBA3_BINARY('timelimit',
                  source='script/tests/timelimit.c',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_BINARY('rpc_open_tcp',
@@ -1567,6 +1578,7 @@ bld.SAMBA3_BINARY('rpc_open_tcp',
                  deps='''
                  talloc
                  msrpc3''',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_BINARY('test_lp_load',
@@ -1575,6 +1587,7 @@ bld.SAMBA3_BINARY('test_lp_load',
                  talloc
                  param
                  popt_samba3''',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_BINARY('dbwrap_tool',
@@ -1589,6 +1602,7 @@ bld.SAMBA3_BINARY('dbwrap_torture',
                  deps='''
                  talloc
                  popt_samba3''',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_BINARY('split_tokens',
@@ -1596,6 +1610,7 @@ bld.SAMBA3_BINARY('split_tokens',
                  deps='''
                  talloc
                  popt_samba3''',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_BINARY('vlp',
@@ -1603,6 +1618,7 @@ bld.SAMBA3_BINARY('vlp',
                  deps='''
                  talloc
                  param''',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_PYTHON('pysmbd',
-- 
1.7.7