diff options
| author | Jeremy Allison <jra@samba.org> | 2009-10-17 10:36:33 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2009-10-17 10:36:33 -0700 |
| commit | 7c51fa6d699a653cafa90df8e44911b576118ebd (patch) | |
| tree | 543bf9ca698e03eff81104898b33e77f1abed319 /pidl/tests | |
| parent | cc3a6770c77ec8fe1cd63bf4c682853c56201f0c (diff) | |
| parent | 3e3214fd91471bca5b6c4d3782e922d252d588fb (diff) | |
| download | samba-7c51fa6d699a653cafa90df8e44911b576118ebd.tar.gz samba-7c51fa6d699a653cafa90df8e44911b576118ebd.tar.bz2 samba-7c51fa6d699a653cafa90df8e44911b576118ebd.zip | |
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
Diffstat (limited to 'pidl/tests')
| -rwxr-xr-x | pidl/tests/ndr.pl | 3 | ||||
| -rwxr-xr-x | pidl/tests/samba-ndr.pl | 2 | ||||
| -rwxr-xr-x | pidl/tests/typelist.pl | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/pidl/tests/ndr.pl b/pidl/tests/ndr.pl index 53b8cb89e3..9c301892ae 100755 --- a/pidl/tests/ndr.pl +++ b/pidl/tests/ndr.pl @@ -533,7 +533,8 @@ $t = { ORIGINAL => { TYPE => "UNION", NAME => "foo" - } + }, + ALIGN => undef }; is_deeply(ParseType($t->{ORIGINAL}, "ref"), $t); diff --git a/pidl/tests/samba-ndr.pl b/pidl/tests/samba-ndr.pl index 5c9c6afd85..e257817809 100755 --- a/pidl/tests/samba-ndr.pl +++ b/pidl/tests/samba-ndr.pl @@ -223,6 +223,7 @@ $generator->ParseStructPush({ ELEMENTS => [ ]}, "ndr", "x"); is($generator->{res}, "if (ndr_flags & NDR_SCALARS) { NDR_CHECK(ndr_push_align(ndr, 4)); + NDR_CHECK(ndr_push_trailer_align(ndr, 4)); } if (ndr_flags & NDR_BUFFERS) { } @@ -248,6 +249,7 @@ is($generator->{res}, "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)); + NDR_CHECK(ndr_push_trailer_align(ndr, 4)); } if (ndr_flags & NDR_BUFFERS) { } diff --git a/pidl/tests/typelist.pl b/pidl/tests/typelist.pl index adefd65ca0..e99b016487 100755 --- a/pidl/tests/typelist.pl +++ b/pidl/tests/typelist.pl @@ -71,7 +71,7 @@ is(0, scalar_is_reference({TYPE => "STRUCT", NAME => "echo_foobar"})); is("uint8", enum_type_fn({TYPE => "ENUM", PARENT=>{PROPERTIES => {enum8bit => 1}}})); is("uint32", enum_type_fn({TYPE => "ENUM", PARENT=>{PROPERTIES => {v1_enum => 1}}})); -is("uint16", enum_type_fn({TYPE => "ENUM", PARENT=>{PROPERTIES => {}}})); +is("uint1632", enum_type_fn({TYPE => "ENUM", PARENT=>{PROPERTIES => {}}})); is("uint8", bitmap_type_fn({TYPE => "BITMAP", PROPERTIES => {bitmap8bit => 1}})); is("uint16", bitmap_type_fn({TYPE => "BITMAP", PROPERTIES => {bitmap16bit => 1}})); |