summaryrefslogtreecommitdiff
path: root/source4/torture/ndr
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2013-01-15 17:04:08 +0100
committerAndreas Schneider <asn@samba.org>2013-01-16 11:42:29 +0100
commit6cdf59d716eb41c8ce67ff55aa661eaa09fa2e1b (patch)
tree3e9a8fef0c6be90af3b1aeb3d764d3b2cad22dad /source4/torture/ndr
parenta4dcf7b94d8f2d8180bb5b390f49e89e2c956a88 (diff)
downloadsamba-6cdf59d716eb41c8ce67ff55aa661eaa09fa2e1b.tar.gz
samba-6cdf59d716eb41c8ce67ff55aa661eaa09fa2e1b.tar.bz2
samba-6cdf59d716eb41c8ce67ff55aa661eaa09fa2e1b.zip
s4-torture: allow to do ndr tests with flags, not only ndr_flags.
Guenther Signed-off-by: Günther Deschner <gd@samba.org> Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'source4/torture/ndr')
-rw-r--r--source4/torture/ndr/ndr.c5
-rw-r--r--source4/torture/ndr/ndr.h12
2 files changed, 14 insertions, 3 deletions
diff --git a/source4/torture/ndr/ndr.c b/source4/torture/ndr/ndr.c
index a7e580fa3c..30cd46ac58 100644
--- a/source4/torture/ndr/ndr.c
+++ b/source4/torture/ndr/ndr.c
@@ -31,6 +31,7 @@ struct ndr_pull_test_data {
ndr_pull_flags_fn_t pull_fn;
ndr_push_flags_fn_t push_fn;
int ndr_flags;
+ int flags;
};
static bool wrap_ndr_pullpush_test(struct torture_context *tctx,
@@ -43,6 +44,8 @@ static bool wrap_ndr_pullpush_test(struct torture_context *tctx,
void *ds = talloc_zero_size(ndr, data->struct_size);
bool ret;
+ ndr->flags |= data->flags;
+
ndr->flags |= LIBNDR_FLAG_REF_ALLOC;
torture_assert_ndr_success(tctx, data->pull_fn(ndr, data->ndr_flags, ds),
@@ -76,6 +79,7 @@ _PUBLIC_ struct torture_test *_torture_suite_add_ndr_pullpush_test(
DATA_BLOB db,
size_t struct_size,
int ndr_flags,
+ int flags,
bool (*check_fn) (struct torture_context *ctx, void *data))
{
struct torture_test *test;
@@ -93,6 +97,7 @@ _PUBLIC_ struct torture_test *_torture_suite_add_ndr_pullpush_test(
data = talloc(test, struct ndr_pull_test_data);
data->data = db;
data->ndr_flags = ndr_flags;
+ data->flags = flags;
data->struct_size = struct_size;
data->pull_fn = pull_fn;
data->push_fn = push_fn;
diff --git a/source4/torture/ndr/ndr.h b/source4/torture/ndr/ndr.h
index ee4db0aa68..068d5f6463 100644
--- a/source4/torture/ndr/ndr.h
+++ b/source4/torture/ndr/ndr.h
@@ -32,6 +32,7 @@ _PUBLIC_ struct torture_test *_torture_suite_add_ndr_pullpush_test(
DATA_BLOB db,
size_t struct_size,
int ndr_flags,
+ int flags,
bool (*check_fn) (struct torture_context *, void *data));
_PUBLIC_ struct torture_test *_torture_suite_add_ndr_pull_inout_test(
@@ -45,19 +46,24 @@ _PUBLIC_ struct torture_test *_torture_suite_add_ndr_pull_inout_test(
#define torture_suite_add_ndr_pull_test(suite,name,data,check_fn) \
_torture_suite_add_ndr_pullpush_test(suite, #name, \
(ndr_pull_flags_fn_t)ndr_pull_ ## name, NULL, data_blob_const(data, sizeof(data)), \
- sizeof(struct name), NDR_SCALARS|NDR_BUFFERS, (bool (*) (struct torture_context *, void *)) check_fn);
+ sizeof(struct name), NDR_SCALARS|NDR_BUFFERS, 0, (bool (*) (struct torture_context *, void *)) check_fn);
#define torture_suite_add_ndr_pull_fn_test(suite,name,data,flags,check_fn) \
_torture_suite_add_ndr_pullpush_test(suite, #name "_" #flags, \
(ndr_pull_flags_fn_t)ndr_pull_ ## name, NULL, data_blob_const(data, sizeof(data)), \
- sizeof(struct name), flags, (bool (*) (struct torture_context *, void *)) check_fn);
+ sizeof(struct name), flags, 0, (bool (*) (struct torture_context *, void *)) check_fn);
+
+#define torture_suite_add_ndr_pull_fn_test_flags(suite,name,data,flags,flags2,check_fn) \
+ _torture_suite_add_ndr_pullpush_test(suite, #name "_" #flags "_" #flags2, \
+ (ndr_pull_flags_fn_t)ndr_pull_ ## name, NULL, data_blob_const(data, sizeof(data)), \
+ sizeof(struct name), flags, flags2, (bool (*) (struct torture_context *, void *)) check_fn);
#define torture_suite_add_ndr_pullpush_test(suite,name,data_blob,check_fn) \
_torture_suite_add_ndr_pullpush_test(suite, #name, \
(ndr_pull_flags_fn_t)ndr_pull_ ## name, \
(ndr_push_flags_fn_t)ndr_push_ ## name, \
data_blob, \
- sizeof(struct name), NDR_SCALARS|NDR_BUFFERS, (bool (*) (struct torture_context *, void *)) check_fn);
+ sizeof(struct name), NDR_SCALARS|NDR_BUFFERS, 0, (bool (*) (struct torture_context *, void *)) check_fn);
#define torture_suite_add_ndr_pull_io_test(suite,name,data_in,data_out,check_fn_out) \
_torture_suite_add_ndr_pull_inout_test(suite, #name "_INOUT", \