1 files changed, 36 insertions, 32 deletions
diff --git a/source4/pidl/tests/ndr_simple.pl b/source4/pidl/tests/ndr_simple.pl
index 2c2c910a56..96e213ede9 100755
--- a/source4/pidl/tests/ndr_simple.pl
+++ b/source4/pidl/tests/ndr_simple.pl
@@ -4,41 +4,45 @@
 # Published under the GNU General Public License
 use strict;
 
-use Parse::Pidl::Test;
+use Test::Simple tests => 4;
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib";
 use Parse::Pidl::IDL;
 use Parse::Pidl::NDR;
-use Parse::Pidl::Samba::NDR;
+use Parse::Pidl::Samba4::NDR::Parser;
 
-my %settings = Parse::Pidl::Test::GetSettings(@ARGV);
-$settings{'IDL-Arguments'} = ['--quiet', '--parse', '--parser=ndr_test.c', '--header=ndr_test.h'];
-$settings{'IncludeFiles'} = ['ndr_test.h'];
-$settings{'ExtraFiles'} = ['ndr_test.c'];
-
-my $pidl = Parse::Pidl::IDL::parse_string('void Test();');
+my $pidl = Parse::Pidl::IDL::parse_string(
+"interface test { void Test(); }; ", "<test>");
+ok (defined($pidl));
 my $pndr = Parse::Pidl::NDR::Parse($pidl);
+ok(defined($pndr));
+my ($header,$parser) = Parse::Pidl::Samba4::NDR::Parser($pndr);
+ok(defined($header));
+ok(defined($parser));
 
-Parse::Pidl::Test::test_idl(
-	# Name
-	'UInt8',
-	
-	# Settings
-	\%settings,
-	
-	
-	# C Test
-	'
-	uint8_t data[] = { 0x02 };
-	uint8_t result;
-	DATA_BLOB b;
-	struct ndr_pull *ndr;
-
-	b.data = data;
-	b.length = 1;
-	ndr = ndr_pull_init_blob(&b, mem_ctx);
-
-	if (NT_STATUS_IS_ERR(ndr_pull_uint8(ndr, NDR_SCALARS, &result)))
-		return 1;
 
-	if (result != 0x02) 
-		return 2;
-');
+#Parse::Pidl::Test::test_idl(
+#	# Name
+#	'UInt8',
+#	
+#	# Settings
+#	\%settings,
+#	
+#	
+#	# C Test
+#	'
+#	uint8_t data[] = { 0x02 };
+#	uint8_t result;
+#	DATA_BLOB b;
+#	struct ndr_pull *ndr;
+#
+#	b.data = data;
+#	b.length = 1;
+#	ndr = ndr_pull_init_blob(&b, mem_ctx);
+#
+#	if (NT_STATUS_IS_ERR(ndr_pull_uint8(ndr, NDR_SCALARS, &result)))
+#		return 1;
+#
+#	if (result != 0x02) 
+#		return 2;
+#');