sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet

Browse Source
This commit is contained in:
Andrew Bartlett 2008-05-01 16:41:36 +10:00
commit 6bb4c1e6a3
32 changed files with 54 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/headermap.txt
View File

@ -44,7 +44,7 @@ rpc_server/common/common.h: dcerpc_server/common.h
libcli/auth/credentials.h: domain_credentials.h
lib/charset/charset.h: charset.h
libcli/ldap/ldap.h: ldap.h
torture/torture.h: torture.h
lib/torture/torture.h: torture.h
libcli/libcli.h: client.h
librpc/gen_ndr/nbt.h: gen_ndr/nbt.h
librpc/gen_ndr/svcctl.h: gen_ndr/svcctl.h
@ -60,7 +60,7 @@ lib/util/asn1.h: samba/asn1.h
libcli/util/error.h: core/error.h
lib/tdb_wrap.h: tdb_wrap.h
lib/ldb_wrap.h: ldb_wrap.h
torture/ui.h: torture/ui.h
torture/smbtorture.h: smbtorture.h
librpc/gen_ndr/winbind.h: gen_ndr/winbind.h
param/share.h: share.h
lib/util/util_tdb.h: util_tdb.h

1
source/lib/basic.mk
View File

@ -16,6 +16,7 @@ mkinclude util/config.mk
mkinclude tdr/config.mk
mkinclude dbwrap/config.mk
mkinclude crypto/config.mk
mkinclude torture/config.mk
[SUBSYSTEM::LIBCOMPRESSION]

2
source/lib/crypto/sha1test.c
View File

@ -17,7 +17,7 @@
*/
#include "includes.h"
#include "torture/ui.h"
#include "torture/torture.h"
#include "lib/crypto/crypto.h"

11
source/lib/torture/config.mk Normal file
View File

@ -0,0 +1,11 @@
# TORTURE subsystem
[LIBRARY::torture]
PUBLIC_DEPENDENCIES = \
LIBSAMBA-HOSTCONFIG \
LIBSAMBA-UTIL \
LIBTALLOC
PC_FILES += lib/torture/torture.pc
torture_OBJ_FILES = $(addprefix lib/torture/, torture.o)
PUBLIC_HEADERS += lib/torture/torture.h

1
source/torture/ui.c → source/lib/torture/torture.c
View File

@ -19,7 +19,6 @@
*/
#include "includes.h"
#include "torture/ui.h"
#include "torture/torture.h"
#include "lib/util/dlinklist.h"
#include "param/param.h"

0
source/torture/ui.h → source/lib/torture/torture.h
View File

2
source/lib/util/tests/str.c
View File

@ -20,7 +20,7 @@
*/
#include "includes.h"
#include "torture/ui.h"
#include "torture/torture.h"
static bool test_string_sub_simple(struct torture_context *tctx)
{

2
source/torture/basic/base.c
View File

@ -19,7 +19,7 @@
*/
#include "includes.h"
#include "torture/torture.h"
#include "torture/smbtorture.h"
#include "torture/basic/proto.h"
#include "libcli/libcli.h"
#include "libcli/raw/raw_proto.h"

3
source/torture/basic/locking.c
View File

@ -23,9 +23,8 @@
#include "includes.h"
#include "libcli/raw/libcliraw.h"
#include "libcli/libcli.h"
#include "torture/ui.h"
#include "torture/smbtorture.h"
#include "torture/util.h"
#include "torture/torture.h"
#include "system/time.h"
#include "system/filesys.h"

2
source/torture/basic/misc.c
View File

@ -30,7 +30,7 @@
#include "libcli/resolve/resolve.h"
#include "auth/credentials/credentials.h"
#include "librpc/gen_ndr/ndr_nbt.h"
#include "torture/torture.h"
#include "torture/smbtorture.h"
#include "torture/util.h"
#include "libcli/smb_composite/smb_composite.h"
#include "libcli/composite/composite.h"

26
source/torture/config.mk
View File

@ -1,17 +1,3 @@
# TORTURE subsystem
[LIBRARY::torture]
PRIVATE_PROTO_HEADER = proto.h
PUBLIC_DEPENDENCIES = \
LIBSAMBA-HOSTCONFIG \
LIBSAMBA-UTIL \
LIBTALLOC \
LIBPOPT
PC_FILES += torture/torture.pc
torture_OBJ_FILES = $(addprefix torture/, torture.o ui.o)
PUBLIC_HEADERS += torture/torture.h torture/ui.h
[SUBSYSTEM::TORTURE_UTIL]
PRIVATE_DEPENDENCIES = LIBCLI_RAW LIBPYTHON smbcalls PROVISION
PUBLIC_DEPENDENCIES = POPT_CREDENTIALS
@ -255,8 +241,9 @@ PRIVATE_DEPENDENCIES = \
# End BINARY smbtorture
#################################
smbtorture_OBJ_FILES = torture/smbtorture.o
smbtorture_OBJ_FILES = torture/smbtorture.o torture/torture.o
PUBLIC_HEADERS += torture/smbtorture.h
MANPAGES += torture/man/smbtorture.1
#################################
@ -340,9 +327,14 @@ gcov: test
do $(GCOV) -p -o $$I $$I/*.c; \
done
lcov: test
samba.info: test
-rm heimdal/lib/*/{lex,parse}.{gcda,gcno}
lcov --base-directory `pwd` --directory . --capture --output-file samba.info
genhtml -o coverage samba.info
lcov: samba.info
genhtml -o coverage $<
testcov-html:: lcov
clean::
@rm -f samba.info

2
source/torture/ldap/common.c
View File

@ -22,7 +22,7 @@
#include "includes.h"
#include "libcli/ldap/ldap_client.h"
#include "torture/torture.h"
#include "torture/smbtorture.h"
#include "torture/ldap/proto.h"
NTSTATUS torture_ldap_bind(struct ldap_connection *conn, const char *userdn, const char *password)

2
source/torture/libnet/libnet.c
View File

@ -18,7 +18,7 @@
*/
#include "includes.h"
#include "torture/torture.h"
#include "torture/smbtorture.h"
#include "librpc/rpc/dcerpc.h"
#include "librpc/gen_ndr/security.h"
#include "librpc/gen_ndr/lsa.h"

2
source/torture/local/dbspeed.c
View File

@ -26,7 +26,7 @@
#include "lib/ldb/include/ldb_errors.h"
#include "lib/ldb_wrap.h"
#include "lib/tdb_wrap.h"
#include "torture/torture.h"
#include "torture/smbtorture.h"
#include "param/param.h"
float tdb_speed;

2
source/torture/local/local.c
View File

@ -18,7 +18,7 @@
*/
#include "includes.h"
#include "torture/torture.h"
#include "torture/smbtorture.h"
#include "torture/local/proto.h"
#include "torture/ndr/ndr.h"
#include "torture/ndr/proto.h"

3
source/torture/nbench/nbench.c
View File

@ -19,9 +19,8 @@
#include "includes.h"
#include "libcli/libcli.h"
#include "torture/ui.h"
#include "torture/util.h"
#include "torture/torture.h"
#include "torture/smbtorture.h"
#include "system/filesys.h"
#include "system/locale.h"
#include "pstring.h"

2
source/torture/nbt/nbt.c
View File

@ -21,7 +21,7 @@
#include "libcli/nbt/libnbt.h"
#include "torture/torture.h"
#include "torture/nbt/proto.h"
#include "torture/ui.h"
#include "torture/smbtorture.h"
#include "libcli/resolve/resolve.h"
#include "param/param.h"

2
source/torture/ndr/ndr.c
View File

@ -21,7 +21,7 @@
#include "includes.h"
#include "torture/ndr/ndr.h"
#include "torture/ndr/proto.h"
#include "torture/ui.h"
#include "torture/torture.h"
#include "util/dlinklist.h"
#include "param/param.h"

2
source/torture/rap/rap.c
View File

@ -21,7 +21,7 @@
#include "includes.h"
#include "libcli/libcli.h"
#include "torture/torture.h"
#include "torture/smbtorture.h"
#include "torture/util.h"
#include "libcli/rap/rap.h"
#include "libcli/raw/libcliraw.h"

2
source/torture/raw/lookuprate.c
View File

@ -20,7 +20,7 @@
#include "includes.h"
#include "param/param.h"
#include "system/filesys.h"
#include "torture/torture.h"
#include "torture/smbtorture.h"
#include "torture/basic/proto.h"
#include "libcli/libcli.h"
#include "torture/util.h"

4
source/torture/raw/raw.c
View File

@ -18,10 +18,10 @@
*/
#include "includes.h"
#include "torture/torture.h"
#include "libcli/raw/libcliraw.h"
#include "torture/raw/proto.h"
#include "torture/util.h"
#include "torture/smbtorture.h"
#include "torture/raw/proto.h"
NTSTATUS torture_raw_init(void)
{

2
source/torture/rpc/rpc.c
View File

@ -23,7 +23,7 @@
#include "lib/cmdline/popt_common.h"
#include "librpc/rpc/dcerpc.h"
#include "torture/rpc/rpc.h"
#include "torture/torture.h"
#include "torture/smbtorture.h"
#include "librpc/ndr/ndr_table.h"
#include "lib/util/dlinklist.h"

2
source/torture/rpc/rpc.h
View File

@ -28,7 +28,7 @@
#include "librpc/rpc/dcerpc.h"
#include "libcli/raw/libcliraw.h"
#include "torture/rpc/proto.h"
#include "torture/ui.h"
#include "torture/torture.h"
struct torture_rpc_tcase {
struct torture_tcase tcase;

1
source/torture/rpc/spoolss_notify.c
View File

@ -21,7 +21,6 @@
#include "includes.h"
#include "torture/torture.h"
#include "torture/ui.h"
#include "torture/rpc/rpc.h"
#include "librpc/gen_ndr/ndr_spoolss_c.h"
#include "rpc_server/dcerpc_server.h"

1
source/torture/rpc/spoolss_win.c
View File

@ -20,7 +20,6 @@
#include "includes.h"
#include "torture/torture.h"
#include "torture/ui.h"
#include "torture/rpc/rpc.h"
#include "librpc/gen_ndr/ndr_spoolss_c.h"
#include "rpc_server/dcerpc_server.h"

2
source/torture/smb2/smb2.c
View File

@ -21,7 +21,7 @@
#include "libcli/smb2/smb2.h"
#include "libcli/smb2/smb2_calls.h"
#include "torture/torture.h"
#include "torture/smbtorture.h"
#include "torture/smb2/proto.h"
#include "lib/util/dlinklist.h"

2
source/torture/smbtorture.c
View File

@ -30,7 +30,7 @@
#include "lib/events/events.h"
#include "dynconfig.h"
#include "torture/torture.h"
#include "torture/smbtorture.h"
#include "build.h"
#include "lib/util/dlinklist.h"
#include "librpc/rpc/dcerpc.h"

9
source/torture/torture.h → source/torture/smbtorture.h
View File

@ -18,10 +18,10 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __TORTURE_H__
#define __TORTURE_H__
#ifndef __SMBTORTURE_H__
#define __SMBTORTURE_H__
#include "torture/ui.h"
#include "torture/torture.h"
struct smbcli_state;
@ -37,5 +37,4 @@ struct torture_test;
int torture_init(void);
bool torture_register_suite(struct torture_suite *suite);
#endif /* __TORTURE_H__ */
#endif /* __SMBTORTURE_H__ */

2
source/torture/unix/unix.c
View File

@ -18,7 +18,7 @@
*/
#include "includes.h"
#include "torture/torture.h"
#include "torture/smbtorture.h"
#include "torture/unix/proto.h"
NTSTATUS torture_unix_init(void)

5
source/torture/util.h
View File

@ -20,6 +20,11 @@
#ifndef _TORTURE_PROVISION_H_
#define _TORTURE_PROVISION_H_
#include "torture/torture.h"
struct smbcli_state;
struct smbcli_tree;
/**
setup a directory ready for a test
*/

1
source/torture/util_smb.c
View File

@ -28,7 +28,6 @@
#include "system/shmem.h"
#include "system/wait.h"
#include "system/time.h"
#include "torture/ui.h"
#include "torture/torture.h"
#include "util/dlinklist.h"
#include "auth/credentials/credentials.h"

2
source/torture/winbind/winbind.c
View File

@ -18,7 +18,7 @@
*/
#include "includes.h"
#include "torture/torture.h"
#include "torture/smbtorture.h"
#include "torture/winbind/proto.h"
NTSTATUS torture_winbind_init(void)