Author: jelmer
Date: 2006-11-23 20:59:09 +0000 (Thu, 23 Nov 2006)
New Revision: 19868

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19868

Log:
Fix more tests.

Modified:
   branches/SAMBA_4_0/source/pidl/tests/Util.pm
   branches/SAMBA_4_0/source/pidl/tests/ndr_align.pl
   branches/SAMBA_4_0/source/pidl/tests/ndr_represent.pl
   branches/SAMBA_4_0/source/pidl/tests/ndr_string.pl


Changeset:
Modified: branches/SAMBA_4_0/source/pidl/tests/Util.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/tests/Util.pm        2006-11-23 19:21:11 UTC 
(rev 19867)
+++ branches/SAMBA_4_0/source/pidl/tests/Util.pm        2006-11-23 20:59:09 UTC 
(rev 19868)
@@ -56,6 +56,7 @@
        print CC "#include <stdio.h>\n";
        print CC "#include <stdbool.h>\n";
        print CC "#include <stdarg.h>\n";
+       print CC "#include <core.h>\n";
        print CC $header;
        print CC $ndrheader;
        print CC $extra if ($extra);

Modified: branches/SAMBA_4_0/source/pidl/tests/ndr_align.pl
===================================================================
--- branches/SAMBA_4_0/source/pidl/tests/ndr_align.pl   2006-11-23 19:21:11 UTC 
(rev 19867)
+++ branches/SAMBA_4_0/source/pidl/tests/ndr_align.pl   2006-11-23 20:59:09 UTC 
(rev 19868)
@@ -119,11 +119,11 @@
                uint8 x;
                [flag(LIBNDR_FLAG_ALIGN2)] DATA_BLOB data;
                uint8 y;
-       } bla;
+       } blie;
 ',
 '
        struct ndr_push *ndr = ndr_push_init();
-       struct bla r;
+       struct blie r;
        uint8_t data[] = { 0x01, 0x02 };
        uint8_t expected[] = { 0x0D, 0x00, 0x0E };
        DATA_BLOB expected_blob = { expected, 3 };
@@ -134,7 +134,7 @@
        r.data.data = data;
        r.data.length = 2;
 
-       if (NT_STATUS_IS_ERR(ndr_push_bla(ndr, NDR_SCALARS|NDR_BUFFERS, &r)))
+       if (NT_STATUS_IS_ERR(ndr_push_blie(ndr, NDR_SCALARS|NDR_BUFFERS, &r)))
                return 1;
 
        result_blob = ndr_push_blob(ndr);

Modified: branches/SAMBA_4_0/source/pidl/tests/ndr_represent.pl
===================================================================
--- branches/SAMBA_4_0/source/pidl/tests/ndr_represent.pl       2006-11-23 
19:21:11 UTC (rev 19867)
+++ branches/SAMBA_4_0/source/pidl/tests/ndr_represent.pl       2006-11-23 
20:59:09 UTC (rev 19868)
@@ -26,7 +26,7 @@
                return 2;
 ',
 '
-#include <core/nterr.h>
+#include <libcli/util/nterr.h>
 
 NTSTATUS ndr_uint8_to_uint32(uint8_t from, uint32_t *to)
 {

Modified: branches/SAMBA_4_0/source/pidl/tests/ndr_string.pl
===================================================================
--- branches/SAMBA_4_0/source/pidl/tests/ndr_string.pl  2006-11-23 19:21:11 UTC 
(rev 19867)
+++ branches/SAMBA_4_0/source/pidl/tests/ndr_string.pl  2006-11-23 20:59:09 UTC 
(rev 19868)
@@ -79,6 +79,6 @@
        if (strncmp(r.out.data, "foo", 3) != 0)
                return 3;
 
-       if (r.in.data[4] != 0)
+       if (r.out.data[4] != 0)
                return 4;
 ');

Reply via email to