diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-09-07 17:12:37 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-09-08 03:35:28 +0200 |
| commit | dd80fc60fd954a3bee86831e887135c4be7ea3fd (patch) | |
| tree | 81c011f8fb83e94bc506a2706aa6b7f5b6a38547 | |
| parent | de318e58b01696e7aea39d14da099dbb4173c055 (diff) | |
| download | samba-dd80fc60fd954a3bee86831e887135c4be7ea3fd.tar.gz samba-dd80fc60fd954a3bee86831e887135c4be7ea3fd.tar.bz2 samba-dd80fc60fd954a3bee86831e887135c4be7ea3fd.zip | |
pidl: adjust expected output for new flag checking
| -rwxr-xr-x | pidl/tests/samba-ndr.pl | 6 |
1 files changed, 4 insertions, 2 deletions
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)); |