From dd80fc60fd954a3bee86831e887135c4be7ea3fd Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 7 Sep 2011 17:12:37 +1000 Subject: pidl: adjust expected output for new flag checking --- pidl/tests/samba-ndr.pl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'pidl') diff --git a/pidl/tests/samba-ndr.pl b/pidl/tests/samba-ndr.pl index e257817809..7c53cbc76f 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)); -- cgit