git.samba.org
/
ira
/
wip.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7a3dd2c
)
talloc-waf: don't build the talloc testsuite in s4
author
Andrew Tridgell
<tridge@samba.org>
Mon, 29 Mar 2010 07:48:50 +0000
(18:48 +1100)
committer
Andrew Tridgell
<tridge@samba.org>
Tue, 6 Apr 2010 10:27:16 +0000
(20:27 +1000)
its built into smbtorture already
lib/talloc/wscript
patch
|
blob
|
history
diff --git
a/lib/talloc/wscript
b/lib/talloc/wscript
index be21bde18c02f08a98a36e8352702ed224dd9c75..e8aa1774e4e48b8650bc2ce5bc227b0720ec38b9 100644
(file)
--- a/
lib/talloc/wscript
+++ b/
lib/talloc/wscript
@@
-35,7
+35,9
@@
def build(bld):
deps='replace',
vnum=VERSION)
- bld.SAMBA_BINARY('talloc_testsuite',
- 'testsuite.c testsuite_main.c',
- deps='talloc',
- install=False)
+ 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)