pidl: adjust expected output for new flag checking
authorAndrew Tridgell <tridge@samba.org>
Wed, 7 Sep 2011 07:12:37 +0000 (17:12 +1000)
committerAndrew Tridgell <tridge@samba.org>
Thu, 8 Sep 2011 01:35:28 +0000 (03:35 +0200)
pidl/tests/samba-ndr.pl

index e2578178099f21ca73ba73705e9d5b6707508ff2..7c53cbc76f0929c3a16b8d01ff46a0449017ee69 100755 (executable)
@@ -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));