12 files changed, 6 insertions, 16 deletions
diff --git a/source4/pidl/lib/Parse/Pidl.pm b/source4/pidl/lib/Parse/Pidl.pm
index a6fc4867c3..0c6e0e5727 100644
--- a/source4/pidl/lib/Parse/Pidl.pm
+++ b/source4/pidl/lib/Parse/Pidl.pm
@@ -17,13 +17,13 @@ use vars qw ( $VERSION );
 
 $VERSION = '0.02';
 
-sub warning($$)
+sub warning
 {
 	my ($l,$m) = @_;
 	print STDERR "$l->{FILE}:$l->{LINE}: warning: $m\n";
 }
 
-sub error($$)
+sub error
 {
 	my ($l,$m) = @_;
 	print STDERR "$l->{FILE}:$l->{LINE}: error: $m\n";
diff --git a/source4/pidl/tests/Util.pm b/source4/pidl/tests/Util.pm
index fdd3c421f6..2f43abe1ed 100644
--- a/source4/pidl/tests/Util.pm
+++ b/source4/pidl/tests/Util.pm
@@ -15,15 +15,15 @@ use lib "$RealBin/../lib";
 
 use Parse::Pidl;
 my $warnings = "";
-sub Parse::Pidl::warning($$) 
-{ 
+undef &Parse::Pidl::warning;
+*Parse::Pidl::warning = sub { 
 	my ($e, $l) = @_;
 	$warnings .= "$e->{FILE}:$e->{LINE}: $l\n";
 };
 
 my $errors = "";
-sub Parse::Pidl::error($$) 
-{ 
+undef &Parse::Pidl::error;
+*Parse::Pidl::error = sub { 
 	my ($e, $l) = @_;
 	$errors .= "$e->{FILE}:$e->{LINE}: $l\n";
 };
diff --git a/source4/pidl/tests/ndr_align.pl b/source4/pidl/tests/ndr_align.pl
index 26f41377e7..5117be95bd 100755
--- a/source4/pidl/tests/ndr_align.pl
+++ b/source4/pidl/tests/ndr_align.pl
@@ -5,7 +5,6 @@ use strict;
 
 use Test::More tests => 5 * 8;
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
 use lib "$RealBin";
 use Util qw(test_samba4_ndr);
 
diff --git a/source4/pidl/tests/ndr_alloc.pl b/source4/pidl/tests/ndr_alloc.pl
index 039826e4ea..61df1c3548 100755
--- a/source4/pidl/tests/ndr_alloc.pl
+++ b/source4/pidl/tests/ndr_alloc.pl
@@ -5,7 +5,6 @@ use strict;
 
 use Test::More tests => 5 * 8;
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
 use lib "$RealBin";
 use Util qw(test_samba4_ndr);
 
diff --git a/source4/pidl/tests/ndr_array.pl b/source4/pidl/tests/ndr_array.pl
index b28070536e..27f42cd391 100755
--- a/source4/pidl/tests/ndr_array.pl
+++ b/source4/pidl/tests/ndr_array.pl
@@ -6,7 +6,6 @@ use strict;
 
 use Test::More tests => 8;
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
 use lib "$RealBin";
 use Util qw(test_samba4_ndr);
 
diff --git a/source4/pidl/tests/ndr_fullptr.pl b/source4/pidl/tests/ndr_fullptr.pl
index dabbc6f5b6..482edcf030 100755
--- a/source4/pidl/tests/ndr_fullptr.pl
+++ b/source4/pidl/tests/ndr_fullptr.pl
@@ -6,7 +6,6 @@ use strict;
 
 use Test::More tests => 1 * 8;
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
 use lib "$RealBin";
 use Util qw(test_samba4_ndr);
 
diff --git a/source4/pidl/tests/ndr_refptr.pl b/source4/pidl/tests/ndr_refptr.pl
index 6940586f01..0bc5fd9416 100755
--- a/source4/pidl/tests/ndr_refptr.pl
+++ b/source4/pidl/tests/ndr_refptr.pl
@@ -7,7 +7,6 @@ use strict;
 
 use Test::More tests => 22 * 8;
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
 use lib "$RealBin";
 use Util qw(test_samba4_ndr);
 
diff --git a/source4/pidl/tests/ndr_represent.pl b/source4/pidl/tests/ndr_represent.pl
index 93764451cf..880ecba827 100644
--- a/source4/pidl/tests/ndr_represent.pl
+++ b/source4/pidl/tests/ndr_represent.pl
@@ -5,7 +5,6 @@ use strict;
 
 use Test::More tests => 1 * 8;
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
 use lib "$RealBin";
 use Util qw(test_samba4_ndr);
 
diff --git a/source4/pidl/tests/ndr_simple.pl b/source4/pidl/tests/ndr_simple.pl
index 9535ee1fae..02803ceea9 100755
--- a/source4/pidl/tests/ndr_simple.pl
+++ b/source4/pidl/tests/ndr_simple.pl
@@ -6,7 +6,6 @@ use strict;
 
 use Test::More tests => 8;
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
 use lib "$RealBin";
 use Util qw(test_samba4_ndr);
 
diff --git a/source4/pidl/tests/ndr_string.pl b/source4/pidl/tests/ndr_string.pl
index dd6afde2b2..23d94be640 100755
--- a/source4/pidl/tests/ndr_string.pl
+++ b/source4/pidl/tests/ndr_string.pl
@@ -6,7 +6,6 @@ use strict;
 
 use Test::More tests => 3 * 8;
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
 use lib "$RealBin";
 use Util qw(test_samba4_ndr);
 
diff --git a/source4/pidl/tests/ndr_tagtype.pl b/source4/pidl/tests/ndr_tagtype.pl
index dcdbc22494..662985a646 100755
--- a/source4/pidl/tests/ndr_tagtype.pl
+++ b/source4/pidl/tests/ndr_tagtype.pl
@@ -5,7 +5,6 @@ use strict;
 
 use Test::More tests => 1 * 8;
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
 use lib "$RealBin";
 use Util qw(test_samba4_ndr);
 
diff --git a/source4/pidl/tests/test_util.pl b/source4/pidl/tests/test_util.pl
index e6133727af..2d59f6283b 100755
--- a/source4/pidl/tests/test_util.pl
+++ b/source4/pidl/tests/test_util.pl
@@ -5,7 +5,6 @@ use strict;
 
 use Test::More tests => 6;
 use FindBin qw($RealBin);
-use lib "$RealBin/../lib";
 use lib "$RealBin";
 use Util qw(test_warnings test_errors);
 use Parse::Pidl qw(warning error);