summaryrefslogtreecommitdiff
path: root/pidl
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-09-07 17:12:37 +1000
committerAndrew Tridgell <tridge@samba.org>2011-09-08 03:35:28 +0200
commitdd80fc60fd954a3bee86831e887135c4be7ea3fd (patch)
tree81c011f8fb83e94bc506a2706aa6b7f5b6a38547 /pidl
parentde318e58b01696e7aea39d14da099dbb4173c055 (diff)
downloadsamba-dd80fc60fd954a3bee86831e887135c4be7ea3fd.tar.gz
pidl: adjust expected output for new flag checking
Diffstat (limited to 'pidl')
-rwxr-xr-xpidl/tests/samba-ndr.pl6
1 files changed, 4 insertions, 2 deletions
diff --git a/pidl/tests/samba-ndr.pl b/pidl/tests/samba-ndr.pl
index e2578178099..7c53cbc76f0 100755
--- a/pidl/tests/samba-ndr.pl
+++ b/pidl/tests/samba-ndr.pl
@@ -221,7 +221,8 @@ $generator->ParseStructPush({
PROPERTIES => {},
ALIGN => 4,
ELEMENTS => [ ]}, "ndr", "x");
-is($generator->{res}, "if (ndr_flags & NDR_SCALARS) {
+is($generator->{res}, "NDR_PUSH_CHECK_FLAGS(ndr, ndr_flags);
+if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_push_align(ndr, 4));
NDR_CHECK(ndr_push_trailer_align(ndr, 4));
}
@@ -245,7 +246,8 @@ $generator->ParseStructPush({
ALIGN => 4,
SURROUNDING_ELEMENT => $e,
ELEMENTS => [ $e ]}, "ndr", "x");
-is($generator->{res}, "if (ndr_flags & NDR_SCALARS) {
+is($generator->{res}, "NDR_PUSH_CHECK_FLAGS(ndr, ndr_flags);
+if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_string_array_size(ndr, x->el1)));
NDR_CHECK(ndr_push_align(ndr, 4));
NDR_CHECK(ndr_push_mytype(ndr, NDR_SCALARS, &x->el1));