summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-08-16 13:41:48 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 15:02:00 -0500
commitb76b6a15225329941c20070d05356aba56044173 (patch)
tree2a020c9de5b3cd8ace5e5f1181cdddc436453b0e
parent8c9abc4be738fc17691f8a36827d50bb5dd3bbb6 (diff)
downloadsamba-b76b6a15225329941c20070d05356aba56044173.tar.gz
samba-b76b6a15225329941c20070d05356aba56044173.tar.bz2
samba-b76b6a15225329941c20070d05356aba56044173.zip
r24492: Parse::Pidl::Samba4::Header::Parse() now takes an $ndr tree
not the $pidl tree anymore. metze (This used to be commit 3cbbddb94c9e986d0adbe3b001146b209cd810d9)
-rw-r--r--source4/pidl/tests/Util.pm8
-rwxr-xr-xsource4/pidl/tests/header.pl4
2 files changed, 8 insertions, 4 deletions
diff --git a/source4/pidl/tests/Util.pm b/source4/pidl/tests/Util.pm
index 897e848440..dfd219186f 100644
--- a/source4/pidl/tests/Util.pm
+++ b/source4/pidl/tests/Util.pm
@@ -48,12 +48,14 @@ sub test_samba4_ndr
{
my ($name,$idl,$c,$extra) = @_;
my $pidl = Parse::Pidl::IDL::parse_string("interface echo { $idl }; ", "<$name>");
-
ok(defined($pidl), "($name) parse idl");
- my $header = Parse::Pidl::Samba4::Header::Parse($pidl);
- ok(defined($header), "($name) generate generic header");
+
my $pndr = Parse::Pidl::NDR::Parse($pidl);
ok(defined($pndr), "($name) generate NDR tree");
+
+ my $header = Parse::Pidl::Samba4::Header::Parse($pndr);
+ ok(defined($header), "($name) generate generic header");
+
my $generator = new Parse::Pidl::Samba4::NDR::Parser();
my ($ndrheader,$ndrparser) = $generator->Parse($pndr, undef, undef);
ok(defined($ndrparser), "($name) generate NDR parser");
diff --git a/source4/pidl/tests/header.pl b/source4/pidl/tests/header.pl
index 331f4dd9fb..c7a57eb009 100755
--- a/source4/pidl/tests/header.pl
+++ b/source4/pidl/tests/header.pl
@@ -11,12 +11,14 @@ use Util;
use Parse::Pidl::Util qw(MyDumper);
use Parse::Pidl::Samba4::Header;
use Parse::Pidl::IDL qw(parse_string);
+use Parse::Pidl::NDR;
sub parse_idl($)
{
my $text = shift;
my $idl = Parse::Pidl::IDL::parse_string($text, "nofile");
- return Parse::Pidl::Samba4::Header::Parse($idl);
+ my $ndr = Parse::Pidl::NDR::Parse($idl);
+ return Parse::Pidl::Samba4::Header::Parse($ndr);
}
like(parse_idl(""), qr/\/\* header auto-generated by pidl \*\/\n/sm, "includes work");