Rebuild Configure from current metaconfig

[perl5.git] / t / porting / globvar.t

diff --git a/t/porting/globvar.t b/t/porting/globvar.t
index f34ab43..bc0203a 100644 (file)
--- a/t/porting/globvar.t
+++ b/t/porting/globvar.t
@@ -14,10 +14,14 @@ skip_all("Code to read symbols not ported to $^O")
 my %skip = map { ("PL_$_", 1) }
     qw(
          DBcv bitcount cshname force_link_funcs generation lastgotoprobe
-         latin1_lc mod_latin1_uc modcount no_symref_sv timesbuf uudmap
-         watchaddr watchok
+         mod_latin1_uc modcount no_symref_sv uudmap
+         watchaddr watchok warn_uninit_sv
      );
 
+$skip{PL_hash_rand_bits}= $skip{PL_hash_rand_bits_enabled}= 1; # we can be compiled without these, so skip testing them
+$skip{PL_warn_locale}= 1; # we can be compiled without locales, so skip testing them
+
+
 my $trial = "nm globals$Config{_o} 2>&1";
 my $yes = `$trial`;
 
@@ -57,13 +61,17 @@ foreach my $file (map {$_ . $Config{_o}} qw(globals regcomp)) {
     close $fh or die "Problem running nm $file";
 }
 
-fail("Attempting to export '$_' which is never defined")
-    foreach sort keys %exported;
+foreach (sort keys %exported) {
+ SKIP: {
+    skip("We dont't export '$_' (Perl not built with this enabled?)",1) if $skip{$_};
+    fail("Attempting to export '$_' which is never defined");
+ }
+}
 
 foreach (sort keys %unexported) {
  SKIP: {
-       skip("We don't export $_", 1) if $skip{$_};
-       fail("$_ is defined, but we do not export it");
+        skip("We don't export '$_'", 1) if $skip{$_};
+        fail("'$_' is defined, but we do not export it");
     }
 }