summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-11-23 20:59:09 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:28:28 -0500
commit0bb6dacc169d34c55feb1938a36b9c8936cea844 (patch)
treeea7d46828dfffdda39f4d44459bc578624cf4001 /source4
parenta2a151a04621e3e2252e207b54526c75deb039d9 (diff)
downloadsamba-0bb6dacc169d34c55feb1938a36b9c8936cea844.tar.gz
samba-0bb6dacc169d34c55feb1938a36b9c8936cea844.tar.bz2
samba-0bb6dacc169d34c55feb1938a36b9c8936cea844.zip
r19868: Fix more tests.
(This used to be commit 01a4fb1b22d09f38636c211a93efc4099f4766b3)
Diffstat (limited to 'source4')
-rw-r--r--source4/pidl/tests/Util.pm1
-rwxr-xr-xsource4/pidl/tests/ndr_align.pl6
-rw-r--r--source4/pidl/tests/ndr_represent.pl2
-rwxr-xr-xsource4/pidl/tests/ndr_string.pl2
4 files changed, 6 insertions, 5 deletions
diff --git a/source4/pidl/tests/Util.pm b/source4/pidl/tests/Util.pm
index e0d87b2dac..83651e6073 100644
--- a/source4/pidl/tests/Util.pm
+++ b/source4/pidl/tests/Util.pm
@@ -56,6 +56,7 @@ SKIP: {
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);
diff --git a/source4/pidl/tests/ndr_align.pl b/source4/pidl/tests/ndr_align.pl
index c05f6383ed..26f41377e7 100755
--- a/source4/pidl/tests/ndr_align.pl
+++ b/source4/pidl/tests/ndr_align.pl
@@ -119,11 +119,11 @@ test_samba4_ndr('align-blob-align2',
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 @@ test_samba4_ndr('align-blob-align2',
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);
diff --git a/source4/pidl/tests/ndr_represent.pl b/source4/pidl/tests/ndr_represent.pl
index 3c6b8cf6ab..93764451cf 100644
--- a/source4/pidl/tests/ndr_represent.pl
+++ b/source4/pidl/tests/ndr_represent.pl
@@ -26,7 +26,7 @@ test_samba4_ndr('represent_as-simple',
return 2;
',
'
-#include <core/nterr.h>
+#include <libcli/util/nterr.h>
NTSTATUS ndr_uint8_to_uint32(uint8_t from, uint32_t *to)
{
diff --git a/source4/pidl/tests/ndr_string.pl b/source4/pidl/tests/ndr_string.pl
index 00ccbb31bb..9a09261996 100755
--- a/source4/pidl/tests/ndr_string.pl
+++ b/source4/pidl/tests/ndr_string.pl
@@ -79,6 +79,6 @@ test_samba4_ndr("string-out",
if (strncmp(r.out.data, "foo", 3) != 0)
return 3;
- if (r.in.data[4] != 0)
+ if (r.out.data[4] != 0)
return 4;
');