[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Thu Oct 20 05:50:04 MDT 2011
The branch, master has been updated
via 3ae478b build: compile (but do not install) all the libsmbclient tests
via 06d138a s3-netapi Compile (but do not install) netapi tests
via 7675cf9 examples: compile libsmbclient tests using just SAMBA_BINARY
from 81f71e7 s3:libsmb/async_smb: in cli_state_notify_pending() we always disconnect
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 3ae478be0fca9a095ac81fa55debcbc51303e6fa
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Oct 20 20:40:58 2011 +1100
build: compile (but do not install) all the libsmbclient tests
Autobuild-User: Andrew Bartlett <abartlet at samba.org>
Autobuild-Date: Thu Oct 20 13:49:39 CEST 2011 on sn-devel-104
commit 06d138a7d91789779634bad5f089b6b00f868584
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Oct 20 13:41:30 2011 +1100
s3-netapi Compile (but do not install) netapi tests
commit 7675cf91d328a4c356f24cc142924a536de45ffd
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Oct 20 13:40:01 2011 +1100
examples: compile libsmbclient tests using just SAMBA_BINARY
This ensures that these compile without the extra includes that SAMBA3_BINARY adds.
Andrew Bartlett
-----------------------------------------------------------------------
Summary of changes:
examples/libsmbclient/wscript_build | 34 +++++++++++++-------------
source3/lib/netapi/tests/wscript_build | 6 ++++
source3/wscript_build | 2 +-
testsuite/libsmbclient/src/wscript_build | 39 ++++++++++++++++++++++++++++++
wscript_build | 1 +
5 files changed, 64 insertions(+), 18 deletions(-)
create mode 100644 source3/lib/netapi/tests/wscript_build
create mode 100644 testsuite/libsmbclient/src/wscript_build
Changeset truncated at 500 lines:
diff --git a/examples/libsmbclient/wscript_build b/examples/libsmbclient/wscript_build
index bb67158..f9ab3dc 100644
--- a/examples/libsmbclient/wscript_build
+++ b/examples/libsmbclient/wscript_build
@@ -1,86 +1,86 @@
#!/usr/bin/env python
-bld.SAMBA3_BINARY('testsmbc',
+bld.SAMBA_BINARY('testsmbc',
source='testsmbc.c',
deps='smbclient',
install=False)
-bld.SAMBA3_BINARY('testacl',
+bld.SAMBA_BINARY('testacl',
source='testacl.c',
deps='smbclient',
install=False)
-bld.SAMBA3_BINARY('testacl2',
+bld.SAMBA_BINARY('testacl2',
source='testacl2.c',
deps='smbclient',
install=False)
-bld.SAMBA3_BINARY('testacl3',
+bld.SAMBA_BINARY('testacl3',
source='testacl3.c',
deps='smbclient',
install=False)
-bld.SAMBA3_BINARY('testbrowse',
+bld.SAMBA_BINARY('testbrowse',
source='testbrowse.c',
deps='smbclient',
install=False)
-bld.SAMBA3_BINARY('testbrowse2',
+bld.SAMBA_BINARY('testbrowse2',
source='testbrowse2.c',
deps='smbclient',
install=False)
-bld.SAMBA3_BINARY('teststat',
+bld.SAMBA_BINARY('teststat',
source='teststat.c',
deps='smbclient',
install=False)
-bld.SAMBA3_BINARY('teststat2',
+bld.SAMBA_BINARY('teststat2',
source='teststat2.c',
deps='smbclient',
install=False)
-bld.SAMBA3_BINARY('teststat3',
+bld.SAMBA_BINARY('teststat3',
source='teststat3.c',
deps='smbclient',
install=False)
-bld.SAMBA3_BINARY('teststatvfs',
+bld.SAMBA_BINARY('teststatvfs',
source='teststatvfs.c',
deps='smbclient',
install=False)
-bld.SAMBA3_BINARY('testfstatvfs',
+bld.SAMBA_BINARY('testfstatvfs',
source='testfstatvfs.c',
deps='smbclient',
install=False)
-bld.SAMBA3_BINARY('testtruncate',
+bld.SAMBA_BINARY('testtruncate',
source='testtruncate.c',
deps='smbclient',
install=False)
-bld.SAMBA3_BINARY('testchmod',
+bld.SAMBA_BINARY('testchmod',
source='testchmod.c',
deps='smbclient',
install=False)
-bld.SAMBA3_BINARY('testutime',
+bld.SAMBA_BINARY('testutime',
source='testutime.c',
deps='smbclient',
install=False)
-bld.SAMBA3_BINARY('testread',
+bld.SAMBA_BINARY('testread',
source='testread.c',
deps='smbclient',
install=False)
-bld.SAMBA3_BINARY('testwrite',
+bld.SAMBA_BINARY('testwrite',
source='testwrite.c',
deps='smbclient',
install=False)
-bld.SAMBA3_BINARY('testctx',
+bld.SAMBA_BINARY('testctx',
source='testctx.c',
deps='smbclient',
install=False)
diff --git a/source3/lib/netapi/tests/wscript_build b/source3/lib/netapi/tests/wscript_build
new file mode 100644
index 0000000..75f3cdf
--- /dev/null
+++ b/source3/lib/netapi/tests/wscript_build
@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+
+bld.SAMBA_BINARY('netapitest',
+ source='netapitest.c netlocalgroup.c netuser.c netgroup.c netdisplay.c netshare.c netfile.c netserver.c common.c',
+ deps='netapi popt',
+ install=False)
diff --git a/source3/wscript_build b/source3/wscript_build
index 77678d6..bcad36e 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -1412,7 +1412,7 @@ bld.RECURSE('../examples/auth')
bld.RECURSE('../examples/libsmbclient')
bld.RECURSE('../examples/pdb')
bld.RECURSE('../examples/VFS')
-
+bld.RECURSE('lib/netapi/tests')
bld.ENFORCE_GROUP_ORDERING()
bld.CHECK_PROJECT_RULES()
diff --git a/testsuite/libsmbclient/src/wscript_build b/testsuite/libsmbclient/src/wscript_build
new file mode 100644
index 0000000..8e732d7
--- /dev/null
+++ b/testsuite/libsmbclient/src/wscript_build
@@ -0,0 +1,39 @@
+#!/bin/env python
+names = [ ("init", range(1, 4)),
+ ("fstat", range(1, 6)),
+ ("open", range(1, 5)),
+ ("unlink", range(1, 12)),
+ ("chown", range(1)),
+ ("close", range(1,2)),
+ ("opendir", range(1, 4)),
+ ("closedir", range(1, 4)),
+ ("rename", range(1, 14)),
+ ("lseek", range(1, 8)),
+ ("lseekdir", range(1, 6)),
+ ("stat", range(1, 6)),
+ ("getdents", range(1, 5)),
+ ("creat", range(1, 3)),
+ ("mkdir", range(1, 4)),
+ ("readdir", range(1, 5)),
+ ("rmdir", range(1, 6)),
+ ("write", range(1, 13)),
+ ("read", range(1, 13)),
+ ("chmod", range(1)),
+ ("telldir", range(1, 5)),
+ ("print_file", range(1, 4)),
+ ("open_print_job", range(1, 2)),
+ ("list_print_jobs", range(1, 7)),
+ ("unlink_print_job", range(1, 5)) ]
+
+for pattern in names:
+ (name, suffixes) = pattern
+ for suffix in map(lambda x: x + 1, suffixes):
+ bld.SAMBA_BINARY('%s_%s' % (name, suffix),
+ source='%s/%s_%s.c' % (name, name, suffix),
+ deps='smbclient',
+ install=False)
+
+bld.SAMBA_BINARY('stat_k',
+ source='stat/stat_k.c',
+ deps='smbclient',
+ install=False)
diff --git a/wscript_build b/wscript_build
index 25d8eff..b11c642 100644
--- a/wscript_build
+++ b/wscript_build
@@ -120,6 +120,7 @@ bld.RECURSE('source3')
bld.RECURSE('dfs_server')
bld.RECURSE('testsuite/headers')
+bld.RECURSE('testsuite/libsmbclient/src')
bld.SYMBOL_CHECK()
bld.DUP_SYMBOL_CHECK()
--
Samba Shared Repository
More information about the samba-cvs
mailing list