Update to include latest Test::Builder alpha

Also updated some tests that the new builder broke

1 files changed, 12 insertions, 4 deletions

diff --git a/ext/DynaLoader/t/DynaLoader.t b/ext/DynaLoader/t/DynaLoader.t
index ade1f8e52b..caf2e507f9 100644
--- a/ext/DynaLoader/t/DynaLoader.t
+++ b/ext/DynaLoader/t/DynaLoader.t
@@ -3,7 +3,7 @@
 use strict;
 use Config;
 use Test::More;
-my %modules;
+my (%modules, %no_unload);
 
 my $db_file;
 BEGIN {
@@ -24,10 +24,16 @@ BEGIN {
     $db_file     => q| ::is( ref $db_file->can('TIEHASH'), 'CODE' ) |,  # 5.0
     'Socket'     => q| ::is( ref Socket->can('inet_aton'),'CODE' ) |,    # 5.0
     'Time::HiRes'=> q| ::is( ref Time::HiRes->can('usleep'),'CODE' ) |,  # 5.7.3
+    'B'          => q| ::is( ref B->can('svref_2object'),'CODE' ) |, # Test::Builder loads this.
+    'Encode'     => q| ::is( ref Encode->can('decode'),'CODE' ) |, # Test::Builder loads this.
 );
 
-plan tests => 26 + keys(%modules) * 3;
-
+# These modules must not be unloaded since they are needed by Test::Builder
+%no_unload = (
+    'B'          => 1,
+    'Encode'     => 1,
+    'List::Util' => 1,
+);
 
 # Try to load the module
 use_ok( 'DynaLoader' );
@@ -137,7 +143,6 @@ for my $module (sort keys %modules) {
     }
 }
 
-# checking internal consistency
 is( scalar @DynaLoader::dl_librefs, scalar keys %modules, "checking number of items in \@dl_librefs" );
 is( scalar @DynaLoader::dl_modules, scalar keys %modules, "checking number of items in \@dl_modules" );
 
@@ -150,6 +155,7 @@ for my $libref (reverse @DynaLoader::dl_librefs) {
             skip "unloading unsupported on $^O", 2
                 if ($old_darwin || $^O eq 'VMS');
             my $module = pop @loaded_modules;
+            next if $no_unload{$module};
             skip "File::Glob sets PL_opfreehook", 2 if $module eq 'File::Glob';
             my $r = eval { DynaLoader::dl_unload_file($libref) };
             is( $@, '', "calling dl_unload_file() for $module" );
@@ -186,3 +192,5 @@ SKIP: {
         "mod2fname + libname_unique correctly truncates long names"
     );
 }
+
+done_testing;