Upgrade to Devel::PPPort 3.08_06

p4raw-id: //depot/perl@28424

30 files changed, 312 insertions, 93 deletions

diff --git a/ext/Devel/PPPort/Changes b/ext/Devel/PPPort/Changes
index 0e79576350..291b451545 100755
--- a/ext/Devel/PPPort/Changes
+++ b/ext/Devel/PPPort/Changes
@@ -1,3 +1,11 @@
+3.08_06 - 2006-06-25
+
+    * fix breakage on MSWin32, where generating XS files on
+      the fly doesn't seem to work the same way as under Linux
+      (thanks to Sadahiro Tomoyuki for providing a patch)
+    * load the shared files only when testing the module
+    * remove PPPort.xs from CPAN distribution
+
 3.08_05 - 2006-06-23
 
     * when in the core, generate PPPort.pm and PPPort.xs
diff --git a/ext/Devel/PPPort/Makefile.PL b/ext/Devel/PPPort/Makefile.PL
index 500b335746..bb0aeb2599 100644
--- a/ext/Devel/PPPort/Makefile.PL
+++ b/ext/Devel/PPPort/Makefile.PL
@@ -4,9 +4,9 @@
 #
 ################################################################################
 #
-#  $Revision: 21 $
+#  $Revision: 24 $
 #  $Author: mhx $
-#  $Date: 2006/06/23 15:55:22 +0200 $
+#  $Date: 2006/06/25 06:30:56 +0200 $
 #
 ################################################################################
 #
@@ -20,70 +20,80 @@
 ################################################################################
 
 use ExtUtils::MakeMaker;
+use strict;
 require 5.003;
 
 unless ($ENV{'PERL_CORE'}) {
   $ENV{'PERL_CORE'} = 1 if grep { $_ eq 'PERL_CORE=1' } @ARGV;
 }
 
-@ARGV = map { /^--with-(.*)/ && ++$opt{$1} ? () : $_ } @ARGV;
-
-%PL_FILES = (
-  'ppport_h.PL'  => 'ppport.h',
-  'PPPort_pm.PL' => 'PPPort.pm',
-  'PPPort_xs.PL' => 'PPPort.xs',
-);
-
-@C_FILES  = qw{ module2.c module3.c };
-
-@clean    = qw{ $(H_FILES) PPPort.c };
-
-%depend   = ( '$(OBJECT)' => '$(H_FILES)' );
-
-if ($opt{'apicheck'}) {
-  $PL_FILES{'apicheck_c.PL'} = 'apicheck.c';
-  push @C_FILES, qw{ apicheck.c };
-  push @clean,   qw{ apicheck.c apicheck.i };
-  $depend{'apicheck.i'} = 'ppport.h';
-}
-
-if ($ENV{'PERL_CORE'}) {
-  # Pods will be built by installman.
-  push @moreopts, MAN3PODS => {};
-  push @clean, qw( PPPort.pm PPPort.xs );
-}
-else {
-  # Devel::PPPort is in the core since 5.7.3
-  push @moreopts, INSTALLDIRS => ($] >= 5.007003 ? 'perl' : 'site');
-}
-
-if (eval $ExtUtils::MakeMaker::VERSION >= 6) {
-  push @moreopts, AUTHOR => 'Marcus Holland-Moritz <mhx@cpan.org>';
-  if (-f 'PPPort.pm') {
-    push @moreopts, ABSTRACT_FROM => 'PPPort.pm';
-  }
-}
+my %opt;
 
-if (eval $ExtUtils::MakeMaker::VERSION >= 6.30_01) {
-  print "Setting license tag...\n";
-  push @moreopts, LICENSE => 'perl';
-}
+@ARGV = map { /^--with-(.*)/ && ++$opt{$1} ? () : $_ } @ARGV;
 
 WriteMakefile(
   NAME          => 'Devel::PPPort',
   VERSION_FROM  => 'PPPort_pm.PL',
-  PL_FILES      => \%PL_FILES,
   PM            => { 'PPPort.pm' => '$(INST_LIBDIR)/PPPort.pm' },
-  C             => \@C_FILES,
   H             => [ qw(ppport.h) ],
   OBJECT        => '$(BASEEXT)$(OBJ_EXT) $(O_FILES)',
   XSPROTOARG    => '-noprototypes',
-  clean         => { FILES => "@clean" },
-  depend        => \%depend,
-  @moreopts,
+  CONFIGURE     => \&configure,
 );
 
-sub MY::postamble {
+sub configure
+{
+  my @clean    = qw{ $(H_FILES) PPPort.xs PPPort.c };
+  my %depend   = ('$(OBJECT)' => '$(H_FILES)');
+  my @C_FILES  = qw{ module2.c module3.c },
+  my %PL_FILES = (
+    'ppport_h.PL'  => 'ppport.h',
+    'PPPort_pm.PL' => 'PPPort.pm',
+    'PPPort_xs.PL' => 'PPPort.xs',
+  );
+  my @moreopts;
+
+  if (eval $ExtUtils::MakeMaker::VERSION >= 6) {
+    push @moreopts, AUTHOR => 'Marcus Holland-Moritz <mhx@cpan.org>';
+    if (-f 'PPPort.pm') {
+      push @moreopts, ABSTRACT_FROM => 'PPPort.pm';
+    }
+  }
+
+  if (eval $ExtUtils::MakeMaker::VERSION >= 6.30_01) {
+    print "Setting license tag...\n";
+    push @moreopts, LICENSE => 'perl';
+  }
+
+  if ($ENV{'PERL_CORE'}) {
+    # Pods will be built by installman.
+    push @moreopts, MAN3PODS => {};
+    push @clean, 'PPPort.pm';
+  }
+  else {
+    # Devel::PPPort is in the core since 5.7.3
+    push @moreopts, INSTALLDIRS => ($] >= 5.007003 ? 'perl' : 'site');
+  }
+
+  if ($opt{'apicheck'}) {
+    $PL_FILES{'apicheck_c.PL'} = 'apicheck.c';
+    push @C_FILES, qw{ apicheck.c };
+    push @clean,   qw{ apicheck.c apicheck.i };
+    $depend{'apicheck.i'} = 'ppport.h';
+  }
+
+  return {
+    C        => \@C_FILES,
+    XS       => { 'PPPort.xs' => 'PPPort.c' },
+    PL_FILES => \%PL_FILES,
+    depend   => \%depend,
+    clean    => { FILES => "@clean" },
+    @moreopts,
+  };
+}
+
+sub MY::postamble
+{
   package MY;
   my $post = shift->SUPER::postamble(@_);
   $post .= <<'POSTAMBLE';
@@ -101,7 +111,8 @@ POSTAMBLE
   return $post;
 }
 
-sub MY::c_o {
+sub MY::c_o
+{
   package MY;
   my $co = shift->SUPER::c_o(@_);
 
diff --git a/ext/Devel/PPPort/PPPort_pm.PL b/ext/Devel/PPPort/PPPort_pm.PL
index 91a81f3d20..8054667335 100644
--- a/ext/Devel/PPPort/PPPort_pm.PL
+++ b/ext/Devel/PPPort/PPPort_pm.PL
@@ -4,9 +4,9 @@
 #
 ################################################################################
 #
-#  $Revision: 45 $
+#  $Revision: 46 $
 #  $Author: mhx $
-#  $Date: 2006/06/23 15:43:09 +0200 $
+#  $Date: 2006/06/25 03:41:11 +0200 $
 #
 ################################################################################
 #
@@ -335,9 +335,9 @@ __DATA__
 #
 ################################################################################
 #
-#  $Revision: 45 $
+#  $Revision: 46 $
 #  $Author: mhx $
-#  $Date: 2006/06/23 15:43:09 +0200 $
+#  $Date: 2006/06/25 03:41:11 +0200 $
 #
 ################################################################################
 #
@@ -496,17 +496,9 @@ See L<h2xs>, L<ppport.h>.
 package Devel::PPPort;
 
 use strict;
-use vars qw($VERSION @ISA $data);
+use vars qw($VERSION $data);
 
-$VERSION = do { my @r = '$Snapshot: /Devel-PPPort/3.08_05 $' =~ /(\d+\.\d+(?:_\d+)?)/; @r ? $r[0] : '9.99' };
-
-# we don't care if the XS cannot be loaded, it's only needed for tests
-
-eval {
-  require DynaLoader;
-  @ISA = qw(DynaLoader);
-  bootstrap Devel::PPPort;
-};
+$VERSION = do { my @r = '$Snapshot: /Devel-PPPort/3.08_06 $' =~ /(\d+\.\d+(?:_\d+)?)/; @r ? $r[0] : '9.99' };
 
 sub _init_data
 {
diff --git a/ext/Devel/PPPort/mktests.PL b/ext/Devel/PPPort/mktests.PL
index 24889b23ef..8b26c84957 100644
--- a/ext/Devel/PPPort/mktests.PL
+++ b/ext/Devel/PPPort/mktests.PL
@@ -4,9 +4,9 @@
 #
 ################################################################################
 #
-#  $Revision: 22 $
+#  $Revision: 25 $
 #  $Author: mhx $
-#  $Date: 2006/05/21 23:15:21 +0200 $
+#  $Date: 2006/06/25 06:30:35 +0200 $
 #
 ################################################################################
 #
@@ -25,34 +25,43 @@ require "parts/ppptools.pl";
 
 my $template = do { local $/; <DATA> };
 
-my $file;
-for $file (glob 'parts/inc/*') {
-  my($testfile) = $file =~ /(\w+)$/;
-  $testfile = "t/$testfile.t";
+generate_tests();
 
-  my $spec = parse_partspec($file);
-  my $plan = 0;
+sub generate_tests
+{
+  my @tests;
+  my $file;
 
-  if (exists $spec->{tests}) {
-    exists $spec->{OPTIONS}{tests} &&
-    exists $spec->{OPTIONS}{tests}{plan}
-        or die "No plan for tests in $file\n";
-
-    print "generating $testfile\n";
-
-    my $tmpl = $template;
-    $tmpl =~ s/__SOURCE__/$file/mg;
-    $tmpl =~ s/__PLAN__/$spec->{OPTIONS}{tests}{plan}/mg;
-    $tmpl =~ s/^__TESTS__$/$spec->{tests}/mg;
-
-    open FH, ">$testfile" or die "$testfile: $!\n";
-    print FH $tmpl;
-    close FH;
+  for $file (glob 'parts/inc/*') {
+    my($testfile) = $file =~ /(\w+)\.?$/;  # VMS has a trailing dot
+    $testfile = "t/$testfile.t";
+  
+    my $spec = parse_partspec($file);
+    my $plan = 0;
+  
+    if (exists $spec->{tests}) {
+      exists $spec->{OPTIONS}{tests} &&
+      exists $spec->{OPTIONS}{tests}{plan}
+          or die "No plan for tests in $file\n";
+  
+      print "generating $testfile\n";
+  
+      my $tmpl = $template;
+      $tmpl =~ s/__SOURCE__/$file/mg;
+      $tmpl =~ s/__PLAN__/$spec->{OPTIONS}{tests}{plan}/mg;
+      $tmpl =~ s/^__TESTS__$/$spec->{tests}/mg;
+  
+      open FH, ">$testfile" or die "$testfile: $!\n";
+      print FH $tmpl;
+      close FH;
+  
+      push @tests, $testfile;
+    }
   }
+  
+  return @tests;
 }
 
-exit 0;
-
 __DATA__
 ################################################################################
 #
@@ -92,4 +101,12 @@ use Devel::PPPort;
 use strict;
 $^W = 1;
 
+package Devel::PPPort;
+use vars '@ISA';
+require DynaLoader;
+@ISA = qw(DynaLoader);
+bootstrap Devel::PPPort;
+
+package main;
+
 __TESTS__
diff --git a/ext/Devel/PPPort/ppport_h.PL b/ext/Devel/PPPort/ppport_h.PL
index 96cbab1ccb..e652c352d9 100644
--- a/ext/Devel/PPPort/ppport_h.PL
+++ b/ext/Devel/PPPort/ppport_h.PL
@@ -4,9 +4,9 @@
 #
 ################################################################################
 #
-#  $Revision: 6 $
+#  $Revision: 7 $
 #  $Author: mhx $
-#  $Date: 2006/01/14 22:38:30 +0100 $
+#  $Date: 2006/06/25 03:41:08 +0200 $
 #
 ################################################################################
 #
@@ -20,7 +20,6 @@
 ################################################################################
 
 package Devel::PPPort;
-sub bootstrap {};
 require "PPPort.pm";
 rename 'ppport.h', 'ppport.old' if -f 'ppport.h';
 unlink "ppport.old" if WriteFile("ppport.h") && -f 'ppport.h';
diff --git a/ext/Devel/PPPort/soak b/ext/Devel/PPPort/soak
index 8066b5f349..e4ccd3e5c4 100644
--- a/ext/Devel/PPPort/soak
+++ b/ext/Devel/PPPort/soak
@@ -33,7 +33,7 @@ use File::Find;
 use List::Util qw(max);
 use Config;
 
-my $VERSION = do { my @r = '$Snapshot: /Devel-PPPort/3.08_05 $' =~ /(\d+\.\d+(?:_\d+)?)/; @r ? $r[0] : '9.99' };
+my $VERSION = do { my @r = '$Snapshot: /Devel-PPPort/3.08_06 $' =~ /(\d+\.\d+(?:_\d+)?)/; @r ? $r[0] : '9.99' };
 
 $| = 1;
 my $verbose = 0;
diff --git a/ext/Devel/PPPort/t/MY_CXT.t b/ext/Devel/PPPort/t/MY_CXT.t
index 77451a3a89..9c94938469 100644
--- a/ext/Devel/PPPort/t/MY_CXT.t
+++ b/ext/Devel/PPPort/t/MY_CXT.t
@@ -36,6 +36,14 @@ use Devel::PPPort;
 use strict;
 $^W = 1;
 
+package Devel::PPPort;
+use vars '@ISA';
+require DynaLoader;
+@ISA = qw(DynaLoader);
+bootstrap Devel::PPPort;
+
+package main;
+
 ok(&Devel::PPPort::MY_CXT_1());
 ok(&Devel::PPPort::MY_CXT_2());
 ok(&Devel::PPPort::MY_CXT_CLONE());
diff --git a/ext/Devel/PPPort/t/SvPV.t b/ext/Devel/PPPort/t/SvPV.t
index f66b9e5506..97901d5151 100644
--- a/ext/Devel/PPPort/t/SvPV.t
+++ b/ext/Devel/PPPort/t/SvPV.t
@@ -36,6 +36,14 @@ use Devel::PPPort;
 use strict;
 $^W = 1;
 
+package Devel::PPPort;
+use vars '@ISA';
+require DynaLoader;
+@ISA = qw(DynaLoader);
+bootstrap Devel::PPPort;
+
+package main;
+
 ok(&Devel::PPPort::SvPVbyte("mhx"), 3);
 ok(&Devel::PPPort::SvPV_nolen("mhx"), 42);
 
diff --git a/ext/Devel/PPPort/t/SvREFCNT.t b/ext/Devel/PPPort/t/SvREFCNT.t
index 576665795c..5c1db315f9 100644
--- a/ext/Devel/PPPort/t/SvREFCNT.t
+++ b/ext/Devel/PPPort/t/SvREFCNT.t
@@ -36,6 +36,14 @@ use Devel::PPPort;
 use strict;
 $^W = 1;
 
+package Devel::PPPort;
+use vars '@ISA';
+require DynaLoader;
+@ISA = qw(DynaLoader);
+bootstrap Devel::PPPort;
+
+package main;
+
 for (Devel::PPPort::SvREFCNT()) {
   ok(defined $_ and $_);
 }
diff --git a/ext/Devel/PPPort/t/Sv_set.t b/ext/Devel/PPPort/t/Sv_set.t
index 9b587e2948..a23c7c8919 100644
--- a/ext/Devel/PPPort/t/Sv_set.t
+++ b/ext/Devel/PPPort/t/Sv_set.t
@@ -36,6 +36,14 @@ use Devel::PPPort;
 use strict;
 $^W = 1;
 
+package Devel::PPPort;
+use vars '@ISA';
+require DynaLoader;
+@ISA = qw(DynaLoader);
+bootstrap Devel::PPPort;
+
+package main;
+
 my $foo = 5;
 ok(&Devel::PPPort::TestSvUV_set($foo, 12345), 42);
 ok(&Devel::PPPort::TestSvPVX_const("mhx"), 43);
diff --git a/ext/Devel/PPPort/t/call.t b/ext/Devel/PPPort/t/call.t
index ca19e1df2c..9a81619a90 100644
--- a/ext/Devel/PPPort/t/call.t
+++ b/ext/Devel/PPPort/t/call.t
@@ -36,6 +36,14 @@ use Devel::PPPort;
 use strict;
 $^W = 1;
 
+package Devel::PPPort;
+use vars '@ISA';
+require DynaLoader;
+@ISA = qw(DynaLoader);
+bootstrap Devel::PPPort;
+
+package main;
+
 sub eq_array
 {
   my($a, $b) = @_;
diff --git a/ext/Devel/PPPort/t/cop.t b/ext/Devel/PPPort/t/cop.t
index dad756d5da..0bcc129ecf 100644
--- a/ext/Devel/PPPort/t/cop.t
+++ b/ext/Devel/PPPort/t/cop.t
@@ -36,6 +36,14 @@ use Devel::PPPort;
 use strict;
 $^W = 1;
 
+package Devel::PPPort;
+use vars '@ISA';
+require DynaLoader;
+@ISA = qw(DynaLoader);
+bootstrap Devel::PPPort;
+
+package main;
+
 my $package;
 {
   package MyPackage;
diff --git a/ext/Devel/PPPort/t/exception.t b/ext/Devel/PPPort/t/exception.t
index ec6b2345eb..e64e00aab6 100644
--- a/ext/Devel/PPPort/t/exception.t
+++ b/ext/Devel/PPPort/t/exception.t
@@ -36,6 +36,14 @@ use Devel::PPPort;
 use strict;
 $^W = 1;
 
+package Devel::PPPort;
+use vars '@ISA';
+require DynaLoader;
+@ISA = qw(DynaLoader);
+bootstrap Devel::PPPort;
+
+package main;
+
 my $rv;
 
 $Devel::PPPort::exception_caught = undef;
diff --git a/ext/Devel/PPPort/t/grok.t b/ext/Devel/PPPort/t/grok.t
index 68af0e6735..cc2f3d6d23 100644
--- a/ext/Devel/PPPort/t/grok.t
+++ b/ext/Devel/PPPort/t/grok.t
@@ -36,6 +36,14 @@ use Devel::PPPort;
 use strict;
 $^W = 1;
 
+package Devel::PPPort;
+use vars '@ISA';
+require DynaLoader;
+@ISA = qw(DynaLoader);
+bootstrap Devel::PPPort;
+
+package main;
+
 ok(&Devel::PPPort::grok_number("42"), 42);
 ok(!defined(&Devel::PPPort::grok_number("A")));
 ok(&Devel::PPPort::grok_bin("10000001"), 129);
diff --git a/ext/Devel/PPPort/t/limits.t b/ext/Devel/PPPort/t/limits.t
index 00496510db..0dcb574479 100644
--- a/ext/Devel/PPPort/t/limits.t
+++ b/ext/Devel/PPPort/t/limits.t
@@ -36,6 +36,14 @@ use Devel::PPPort;
 use strict;
 $^W = 1;
 
+package Devel::PPPort;
+use vars '@ISA';
+require DynaLoader;
+@ISA = qw(DynaLoader);
+bootstrap Devel::PPPort;
+
+package main;
+
 ok(&Devel::PPPort::iv_size());
 ok(&Devel::PPPort::uv_size());
 ok(&Devel::PPPort::iv_type());
diff --git a/ext/Devel/PPPort/t/mPUSH.t b/ext/Devel/PPPort/t/mPUSH.t
index 36ae697373..577eda629d 100644
--- a/ext/Devel/PPPort/t/mPUSH.t
+++ b/ext/Devel/PPPort/t/mPUSH.t
@@ -36,6 +36,14 @@ use Devel::PPPort;
 use strict;
 $^W = 1;
 
+package Devel::PPPort;
+use vars '@ISA';
+require DynaLoader;
+@ISA = qw(DynaLoader);
+bootstrap Devel::PPPort;
+
+package main;
+
 ok(join(':', &Devel::PPPort::mPUSHp()), "one:two:three");
 ok(join(':', &Devel::PPPort::mPUSHn()), "0.5:-0.25:0.125");
 ok(join(':', &Devel::PPPort::mPUSHi()), "-1:2:-3");
diff --git a/ext/Devel/PPPort/t/magic.t b/ext/Devel/PPPort/t/magic.t
index dbc6630ea9..328e77398c 100644
--- a/ext/Devel/PPPort/t/magic.t
+++ b/ext/Devel/PPPort/t/magic.t
@@ -36,6 +36,14 @@ use Devel::PPPort;
 use strict;
 $^W = 1;
 
+package Devel::PPPort;
+use vars '@ISA';
+require DynaLoader;
+@ISA = qw(DynaLoader);
+bootstrap Devel::PPPort;
+
+package main;
+
 use Tie::Hash;
 my %h;
 tie %h, 'Tie::StdHash';
diff --git a/ext/Devel/PPPort/t/memory.t b/ext/Devel/PPPort/t/memory.t
index c25744c4da..7dadecbf6d 100644
--- a/ext/Devel/PPPort/t/memory.t
+++ b/ext/Devel/PPPort/t/memory.t
@@ -36,5 +36,13 @@ use Devel::PPPort;
 use strict;
 $^W = 1;
 
+package Devel::PPPort;
+use vars '@ISA';
+require DynaLoader;
+@ISA = qw(DynaLoader);
+bootstrap Devel::PPPort;
+
+package main;
+
 ok(Devel::PPPort::checkmem(), 4);
 
diff --git a/ext/Devel/PPPort/t/misc.t b/ext/Devel/PPPort/t/misc.t
index 6171ef2eea..2923ee02f5 100644
--- a/ext/Devel/PPPort/t/misc.t
+++ b/ext/Devel/PPPort/t/misc.t
@@ -36,6 +36,14 @@ use Devel::PPPort;
 use strict;
 $^W = 1;
 
+package Devel::PPPort;
+use vars '@ISA';
+require DynaLoader;
+@ISA = qw(DynaLoader);
+bootstrap Devel::PPPort;
+
+package main;
+
 use vars qw($my_sv @my_av %my_hv);
 
 my @s = &Devel::PPPort::newSVpvn();
diff --git a/ext/Devel/PPPort/t/newCONSTSUB.t b/ext/Devel/PPPort/t/newCONSTSUB.t
index 60bfab83f1..d8fd9295c1 100644
--- a/ext/Devel/PPPort/t/newCONSTSUB.t
+++ b/ext/Devel/PPPort/t/newCONSTSUB.t
@@ -36,6 +36,14 @@ use Devel::PPPort;
 use strict;
 $^W = 1;
 
+package Devel::PPPort;
+use vars '@ISA';
+require DynaLoader;
+@ISA = qw(DynaLoader);
+bootstrap Devel::PPPort;
+
+package main;
+
 &Devel::PPPort::call_newCONSTSUB_1();
 ok(&Devel::PPPort::test_value_1(), 1);
 
diff --git a/ext/Devel/PPPort/t/newRV.t b/ext/Devel/PPPort/t/newRV.t
index 98167be6fe..5866df356b 100644
--- a/ext/Devel/PPPort/t/newRV.t
+++ b/ext/Devel/PPPort/t/newRV.t
@@ -36,6 +36,14 @@ use Devel::PPPort;
 use strict;
 $^W = 1;
 
+package Devel::PPPort;
+use vars '@ISA';
+require DynaLoader;
+@ISA = qw(DynaLoader);
+bootstrap Devel::PPPort;
+
+package main;
+
 ok(&Devel::PPPort::newRV_inc_REFCNT, 1);
 ok(&Devel::PPPort::newRV_noinc_REFCNT, 1);
 
diff --git a/ext/Devel/PPPort/t/podtest.t b/ext/Devel/PPPort/t/podtest.t
index 257197f144..bf7ed53a40 100644
--- a/ext/Devel/PPPort/t/podtest.t
+++ b/ext/Devel/PPPort/t/podtest.t
@@ -36,6 +36,14 @@ use Devel::PPPort;
 use strict;
 $^W = 1;
 
+package Devel::PPPort;
+use vars '@ISA';
+require DynaLoader;
+@ISA = qw(DynaLoader);
+bootstrap Devel::PPPort;
+
+package main;
+
 my @pods = qw( HACKERS PPPort.pm ppport.h devel/regenerate devel/buildperl.pl );
 
 my $reason = '';
diff --git a/ext/Devel/PPPort/t/ppphtest.t b/ext/Devel/PPPort/t/ppphtest.t
index 82ee77eff3..6148195f93 100644
--- a/ext/Devel/PPPort/t/ppphtest.t
+++ b/ext/Devel/PPPort/t/ppphtest.t
@@ -36,6 +36,14 @@ use Devel::PPPort;
 use strict;
 $^W = 1;
 
+package Devel::PPPort;
+use vars '@ISA';
+require DynaLoader;
+@ISA = qw(DynaLoader);
+bootstrap Devel::PPPort;
+
+package main;
+
 BEGIN {
   if ($ENV{'SKIP_SLOW_TESTS'}) {
     for (1 .. 202) {
diff --git a/ext/Devel/PPPort/t/pvs.t b/ext/Devel/PPPort/t/pvs.t
index ea250016c3..c022d9ab76 100644
--- a/ext/Devel/PPPort/t/pvs.t
+++ b/ext/Devel/PPPort/t/pvs.t
@@ -36,6 +36,14 @@ use Devel::PPPort;
 use strict;
 $^W = 1;
 
+package Devel::PPPort;
+use vars '@ISA';
+require DynaLoader;
+@ISA = qw(DynaLoader);
+bootstrap Devel::PPPort;
+
+package main;
+
 my $x = 'foo';
 
 ok(Devel::PPPort::newSVpvs(), "newSVpvs");
diff --git a/ext/Devel/PPPort/t/snprintf.t b/ext/Devel/PPPort/t/snprintf.t
index 9c2c6b16f1..f56a64ef97 100644
--- a/ext/Devel/PPPort/t/snprintf.t
+++ b/ext/Devel/PPPort/t/snprintf.t
@@ -36,6 +36,14 @@ use Devel::PPPort;
 use strict;
 $^W = 1;
 
+package Devel::PPPort;
+use vars '@ISA';
+require DynaLoader;
+@ISA = qw(DynaLoader);
+bootstrap Devel::PPPort;
+
+package main;
+
 my($l, $s) = Devel::PPPort::my_snprintf();
 ok($l, 8);
 ok($s, "foobar42");
diff --git a/ext/Devel/PPPort/t/sv_xpvf.t b/ext/Devel/PPPort/t/sv_xpvf.t
index 5c827d3da1..8af1186349 100644
--- a/ext/Devel/PPPort/t/sv_xpvf.t
+++ b/ext/Devel/PPPort/t/sv_xpvf.t
@@ -36,6 +36,14 @@ use Devel::PPPort;
 use strict;
 $^W = 1;
 
+package Devel::PPPort;
+use vars '@ISA';
+require DynaLoader;
+@ISA = qw(DynaLoader);
+bootstrap Devel::PPPort;
+
+package main;
+
 use Tie::Hash;
 my %h;
 tie %h, 'Tie::StdHash';
diff --git a/ext/Devel/PPPort/t/threads.t b/ext/Devel/PPPort/t/threads.t
index 2e9f896483..86af3bdb16 100644
--- a/ext/Devel/PPPort/t/threads.t
+++ b/ext/Devel/PPPort/t/threads.t
@@ -36,6 +36,14 @@ use Devel::PPPort;
 use strict;
 $^W = 1;
 
+package Devel::PPPort;
+use vars '@ISA';
+require DynaLoader;
+@ISA = qw(DynaLoader);
+bootstrap Devel::PPPort;
+
+package main;
+
 ok(&Devel::PPPort::no_THX_arg("42"), 43);
 eval { &Devel::PPPort::with_THX_arg("yes\n"); };
 ok($@ =~ /^yes/);
diff --git a/ext/Devel/PPPort/t/uv.t b/ext/Devel/PPPort/t/uv.t
index 1d5ae2b458..72fac59854 100644
--- a/ext/Devel/PPPort/t/uv.t
+++ b/ext/Devel/PPPort/t/uv.t
@@ -36,6 +36,14 @@ use Devel::PPPort;
 use strict;
 $^W = 1;
 
+package Devel::PPPort;
+use vars '@ISA';
+require DynaLoader;
+@ISA = qw(DynaLoader);
+bootstrap Devel::PPPort;
+
+package main;
+
 ok(&Devel::PPPort::sv_setuv(42), 42);
 ok(&Devel::PPPort::newSVuv(123), 123);
 ok(&Devel::PPPort::sv_2uv("4711"), 4711);
diff --git a/ext/Devel/PPPort/t/variables.t b/ext/Devel/PPPort/t/variables.t
index 54a9fd69b4..8d071e4f50 100644
--- a/ext/Devel/PPPort/t/variables.t
+++ b/ext/Devel/PPPort/t/variables.t
@@ -36,5 +36,13 @@ use Devel::PPPort;
 use strict;
 $^W = 1;
 
+package Devel::PPPort;
+use vars '@ISA';
+require DynaLoader;
+@ISA = qw(DynaLoader);
+bootstrap Devel::PPPort;
+
+package main;
+
 ok(Devel::PPPort::compare_PL_signals());
 
diff --git a/ext/Devel/PPPort/t/warn.t b/ext/Devel/PPPort/t/warn.t
index 8dd06bf98f..cd0d1b581c 100644
--- a/ext/Devel/PPPort/t/warn.t
+++ b/ext/Devel/PPPort/t/warn.t
@@ -36,6 +36,14 @@ use Devel::PPPort;
 use strict;
 $^W = 1;
 
+package Devel::PPPort;
+use vars '@ISA';
+require DynaLoader;
+@ISA = qw(DynaLoader);
+bootstrap Devel::PPPort;
+
+package main;
+
 $^W = 0;
 
 my $warning;