diff options
author | Stefan Metzmacher <metze@samba.org> | 2006-02-04 14:08:24 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:51:47 -0500 |
commit | 1a53c1dc927efbc6a594ed513feb9ab9247078e8 (patch) | |
tree | 1a93785abb3ba5af9e321dcc9bb299f30c512ffd | |
parent | 289e9baa1d9ab7fa36d88a5cd50c0a0f706c07bb (diff) | |
download | samba-1a53c1dc927efbc6a594ed513feb9ab9247078e8.tar.gz samba-1a53c1dc927efbc6a594ed513feb9ab9247078e8.tar.bz2 samba-1a53c1dc927efbc6a594ed513feb9ab9247078e8.zip |
r13346: use private proto header files for the torture tests
metze
(This used to be commit 67837dbd2bcff8ec1917ba02884ee2eaa0776b46)
24 files changed, 66 insertions, 1 deletions
diff --git a/source4/torture/basic/delete.c b/source4/torture/basic/delete.c index ac168b3ed4..983f67ad1a 100644 --- a/source4/torture/basic/delete.c +++ b/source4/torture/basic/delete.c @@ -26,6 +26,8 @@ #include "system/filesys.h" #include "libcli/raw/libcliraw.h" +#include "torture/raw/proto.h" + static BOOL check_delete_on_close(struct smbcli_state *cli, int fnum, const char *fname, BOOL expect_it) { diff --git a/source4/torture/config.mk b/source4/torture/config.mk index c7e8e2cc48..fdc2006ef8 100644 --- a/source4/torture/config.mk +++ b/source4/torture/config.mk @@ -3,6 +3,8 @@ ################################# # Start SUBSYSTEM TORTURE_BASIC [SUBSYSTEM::TORTURE_BASIC] +PRIVATE_PROTO_HEADER = \ + basic/proto.h OBJ_FILES = \ basic/scanner.o \ basic/utable.o \ @@ -28,6 +30,8 @@ REQUIRED_SUBSYSTEMS = \ ################################# # Start SUBSYSTEM TORTURE_RAW [SUBSYSTEM::TORTURE_RAW] +PRIVATE_PROTO_HEADER = \ + raw/proto.h OBJ_FILES = \ raw/qfsinfo.o \ raw/qfileinfo.o \ @@ -62,6 +66,8 @@ include smb2/config.mk ################################# # Start SUBSYSTEM TORTURE_COM [SUBSYSTEM::TORTURE_COM] +PRIVATE_PROTO_HEADER = \ + com/proto.h OBJ_FILES = \ com/simple.o REQUIRED_SUBSYSTEMS = \ @@ -72,6 +78,8 @@ REQUIRED_SUBSYSTEMS = \ ################################# # Start SUBSYSTEM TORTURE_RPC [SUBSYSTEM::TORTURE_RPC] +PRIVATE_PROTO_HEADER = \ + rpc/proto.h OBJ_FILES = \ rpc/join.o \ rpc/lsa.o \ @@ -123,6 +131,8 @@ REQUIRED_SUBSYSTEMS = \ ################################# # Start SUBSYSTEM TORTURE_RAP [SUBSYSTEM::TORTURE_RAP] +PRIVATE_PROTO_HEADER = \ + rap/proto.h OBJ_FILES = \ rap/rap.o REQUIRED_SUBSYSTEMS = \ @@ -133,6 +143,8 @@ REQUIRED_SUBSYSTEMS = \ ################################# # Start SUBSYSTEM TORTURE_AUTH [SUBSYSTEM::TORTURE_AUTH] +PRIVATE_PROTO_HEADER = \ + auth/proto.h OBJ_FILES = \ auth/ntlmssp.o \ auth/pac.o @@ -146,6 +158,8 @@ include local/config.mk ################################# # Start SUBSYSTEM TORTURE_NBENCH [SUBSYSTEM::TORTURE_NBENCH] +PRIVATE_PROTO_HEADER = \ + nbench/proto.h OBJ_FILES = \ nbench/nbio.o \ nbench/nbench.o @@ -155,6 +169,8 @@ OBJ_FILES = \ ################################# # Start SUBSYSTEM TORTURE_LDAP [SUBSYSTEM::TORTURE_LDAP] +PRIVATE_PROTO_HEADER = \ + ldap/proto.h OBJ_FILES = \ ldap/common.o \ ldap/basic.o \ @@ -168,6 +184,8 @@ REQUIRED_SUBSYSTEMS = \ ################################# # Start SUBSYSTEM TORTURE_NBT [SUBSYSTEM::TORTURE_NBT] +PRIVATE_PROTO_HEADER = \ + nbt/proto.h OBJ_FILES = \ nbt/query.o \ nbt/register.o \ @@ -184,6 +202,8 @@ REQUIRED_SUBSYSTEMS = \ ################################# # Start SUBSYSTEM TORTURE_NET [SUBSYSTEM::TORTURE_NET] +PRIVATE_PROTO_HEADER = \ + libnet/proto.h OBJ_FILES = \ libnet/userinfo.o \ libnet/userman.o \ diff --git a/source4/torture/ldap/basic.c b/source4/torture/ldap/basic.c index 64c4dbfdf0..b7a2242c95 100644 --- a/source4/torture/ldap/basic.c +++ b/source4/torture/ldap/basic.c @@ -25,6 +25,8 @@ #include "libcli/ldap/ldap_client.h" #include "lib/cmdline/popt_common.h" +#include "torture/ldap/proto.h" + static BOOL test_bind_simple(struct ldap_connection *conn, const char *userdn, const char *password) { NTSTATUS status; diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk index f45fb2247d..7ee7a13d58 100644 --- a/source4/torture/local/config.mk +++ b/source4/torture/local/config.mk @@ -1,6 +1,8 @@ ################################# # Start SUBSYSTEM TORTURE_LOCAL [SUBSYSTEM::TORTURE_LOCAL] +PRIVATE_PROTO_HEADER = \ + proto.h OBJ_FILES = \ iconv.o \ ../../lib/talloc/testsuite.o \ diff --git a/source4/torture/nbench/nbench.c b/source4/torture/nbench/nbench.c index 4357dd53a1..77a94145f5 100644 --- a/source4/torture/nbench/nbench.c +++ b/source4/torture/nbench/nbench.c @@ -24,6 +24,8 @@ #include "system/filesys.h" #include "pstring.h" +#include "torture/nbench/proto.h" + int nbench_line_count = 0; static int timelimit = 600; static int warmup; diff --git a/source4/torture/nbt/dgram.c b/source4/torture/nbt/dgram.c index 821a169314..f44b819329 100644 --- a/source4/torture/nbt/dgram.c +++ b/source4/torture/nbt/dgram.c @@ -25,6 +25,7 @@ #include "librpc/gen_ndr/ndr_samr.h" #include "lib/socket/socket.h" #include "lib/events/events.h" +#include "torture/rpc/proto.h" #define TEST_NAME "TORTURE_TEST" diff --git a/source4/torture/rpc/alter_context.c b/source4/torture/rpc/alter_context.c index 0f07985917..d75d367a1e 100644 --- a/source4/torture/rpc/alter_context.c +++ b/source4/torture/rpc/alter_context.c @@ -24,7 +24,7 @@ #include "torture/torture.h" #include "librpc/gen_ndr/ndr_lsa.h" #include "librpc/gen_ndr/ndr_dssetup.h" - +#include "torture/rpc/proto.h" BOOL torture_rpc_alter_context(void) { diff --git a/source4/torture/rpc/drsuapi.c b/source4/torture/rpc/drsuapi.c index e9c2e9d049..e63915992a 100644 --- a/source4/torture/rpc/drsuapi.c +++ b/source4/torture/rpc/drsuapi.c @@ -26,6 +26,7 @@ #include "torture/torture.h" #include "librpc/gen_ndr/ndr_drsuapi.h" #include "torture/rpc/drsuapi.h" +#include "torture/rpc/proto.h" BOOL test_DsBind(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct DsPrivate *priv) diff --git a/source4/torture/rpc/drsuapi_cracknames.c b/source4/torture/rpc/drsuapi_cracknames.c index 6af8ed827b..227ddb200e 100644 --- a/source4/torture/rpc/drsuapi_cracknames.c +++ b/source4/torture/rpc/drsuapi_cracknames.c @@ -26,6 +26,7 @@ #include "torture/torture.h" #include "librpc/gen_ndr/ndr_drsuapi.h" #include "torture/rpc/drsuapi.h" +#include "torture/rpc/proto.h" #include "ldb/include/ldb.h" static BOOL test_DsCrackNamesMatrix(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, diff --git a/source4/torture/rpc/dssync.c b/source4/torture/rpc/dssync.c index 4079afba15..3731f19c61 100644 --- a/source4/torture/rpc/dssync.c +++ b/source4/torture/rpc/dssync.c @@ -25,6 +25,7 @@ #include "lib/cmdline/popt_common.h" #include "librpc/gen_ndr/ndr_drsuapi.h" #include "libcli/cldap/cldap.h" +#include "torture/ldap/proto.h" struct DsSyncBindInfo { struct dcerpc_pipe *pipe; diff --git a/source4/torture/rpc/join.c b/source4/torture/rpc/join.c index 8ea94279be..b9ffe32f2f 100644 --- a/source4/torture/rpc/join.c +++ b/source4/torture/rpc/join.c @@ -1,6 +1,8 @@ #include "includes.h" #include "libnet/libnet.h" +#include "torture/rpc/proto.h" + #define TORTURE_NETBIOS_NAME "smbtorturejoin" diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c index 6dc3158a9f..7919e7c441 100644 --- a/source4/torture/rpc/netlogon.c +++ b/source4/torture/rpc/netlogon.c @@ -28,6 +28,7 @@ #include "auth/auth.h" #include "smb.h" #include "lib/cmdline/popt_common.h" +#include "torture/rpc/proto.h" static const char *machine_password; diff --git a/source4/torture/rpc/samlogon.c b/source4/torture/rpc/samlogon.c index af29d44347..69c9ff6ea9 100644 --- a/source4/torture/rpc/samlogon.c +++ b/source4/torture/rpc/samlogon.c @@ -27,6 +27,7 @@ #include "auth/auth.h" #include "lib/crypto/crypto.h" #include "lib/cmdline/popt_common.h" +#include "torture/rpc/proto.h" #define TEST_MACHINE_NAME "samlogontest" #define TEST_USER_NAME "samlogontestuser" diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c index ffab694672..afa47e5932 100644 --- a/source4/torture/rpc/samsync.c +++ b/source4/torture/rpc/samsync.c @@ -28,6 +28,7 @@ #include "dlinklist.h" #include "lib/crypto/crypto.h" #include "system/time.h" +#include "torture/rpc/proto.h" #define TEST_MACHINE_NAME "samsynctest" #define TEST_WKSTA_MACHINE_NAME "samsynctest2" diff --git a/source4/torture/rpc/schannel.c b/source4/torture/rpc/schannel.c index eba9affce0..4e9d644138 100644 --- a/source4/torture/rpc/schannel.c +++ b/source4/torture/rpc/schannel.c @@ -22,6 +22,7 @@ #include "includes.h" #include "librpc/gen_ndr/ndr_netlogon.h" +#include "torture/rpc/proto.h" #define TEST_MACHINE_NAME "schannel" diff --git a/source4/torture/rpc/session_key.c b/source4/torture/rpc/session_key.c index 8a9cdea302..26626c908e 100644 --- a/source4/torture/rpc/session_key.c +++ b/source4/torture/rpc/session_key.c @@ -24,6 +24,8 @@ #include "torture/torture.h" #include "librpc/gen_ndr/ndr_lsa.h" +#include "torture/rpc/proto.h" + static void init_lsa_String(struct lsa_String *name, const char *s) { name->string = s; diff --git a/source4/torture/rpc/testjoin.c b/source4/torture/rpc/testjoin.c index f844ad8ca8..39634b9186 100644 --- a/source4/torture/rpc/testjoin.c +++ b/source4/torture/rpc/testjoin.c @@ -34,6 +34,7 @@ #include "smb.h" #include "lib/ldb/include/ldb.h" +#include "torture/rpc/proto.h" struct test_join { struct dcerpc_pipe *p; diff --git a/source4/torture/smb2/config.mk b/source4/torture/smb2/config.mk index 90e57bd6d8..8c95208151 100644 --- a/source4/torture/smb2/config.mk +++ b/source4/torture/smb2/config.mk @@ -2,6 +2,8 @@ ################################# # Start SUBSYSTEM TORTURE_SMB2 [SUBSYSTEM::TORTURE_SMB2] +PRIVATE_PROTO_HEADER = \ + proto.h OBJ_FILES = \ connect.o \ scan.o \ diff --git a/source4/torture/smb2/connect.c b/source4/torture/smb2/connect.c index d4016b8770..7472493894 100644 --- a/source4/torture/smb2/connect.c +++ b/source4/torture/smb2/connect.c @@ -25,6 +25,8 @@ #include "libcli/smb2/smb2.h" #include "libcli/smb2/smb2_calls.h" +#include "torture/smb2/proto.h" + /* send a close */ diff --git a/source4/torture/smb2/find.c b/source4/torture/smb2/find.c index aae8f8042f..07c3f865e2 100644 --- a/source4/torture/smb2/find.c +++ b/source4/torture/smb2/find.c @@ -24,6 +24,8 @@ #include "libcli/smb2/smb2.h" #include "libcli/smb2/smb2_calls.h" +#include "torture/smb2/proto.h" + static struct { const char *name; uint16_t level; diff --git a/source4/torture/smb2/getinfo.c b/source4/torture/smb2/getinfo.c index faf889f8ff..2e3d2f2fac 100644 --- a/source4/torture/smb2/getinfo.c +++ b/source4/torture/smb2/getinfo.c @@ -24,6 +24,8 @@ #include "libcli/smb2/smb2.h" #include "libcli/smb2/smb2_calls.h" +#include "torture/smb2/proto.h" + static struct { const char *name; uint16_t level; diff --git a/source4/torture/smb2/scan.c b/source4/torture/smb2/scan.c index 646f790e18..44dced9427 100644 --- a/source4/torture/smb2/scan.c +++ b/source4/torture/smb2/scan.c @@ -26,6 +26,7 @@ #include "lib/cmdline/popt_common.h" #include "lib/events/events.h" +#include "torture/smb2/proto.h" #define FNAME "scan-getinfo.dat" #define DNAME "scan-getinfo.dir" diff --git a/source4/torture/smb2/setinfo.c b/source4/torture/smb2/setinfo.c index bf63d26dbb..562493b047 100644 --- a/source4/torture/smb2/setinfo.c +++ b/source4/torture/smb2/setinfo.c @@ -25,6 +25,8 @@ #include "libcli/smb2/smb2.h" #include "libcli/smb2/smb2_calls.h" +#include "torture/smb2/proto.h" + #define BASEDIR "" /* basic testing of all SMB2 setinfo calls diff --git a/source4/torture/torture.c b/source4/torture/torture.c index a37fde6938..9eded4d29e 100644 --- a/source4/torture/torture.c +++ b/source4/torture/torture.c @@ -28,6 +28,19 @@ #include "libcli/libcli.h" #include "librpc/rpc/dcerpc_table.h" +#include "torture/basic/proto.h" +#include "torture/raw/proto.h" +#include "torture/smb2/proto.h" +#include "torture/rpc/proto.h" +#include "torture/rap/proto.h" +#include "torture/auth/proto.h" +#include "torture/local/proto.h" +#include "torture/nbench/proto.h" +#include "torture/ldap/proto.h" +#include "torture/com/proto.h" +#include "torture/nbt/proto.h" +#include "torture/libnet/proto.h" + int torture_nprocs=4; int torture_numops=10; int torture_entries=1000; |