r24492: Parse::Pidl::Samba4::Header::Parse() now takes an $ndr tree

not the $pidl tree anymore.

metze
(This used to be commit 3cbbddb94c9e986d0adbe3b001146b209cd810d9)

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");