Fixes for XSConfig

Perl-Toolchain-Gang · Apr 19, 2017 · 14f8f52 · 14f8f52
1 parent 7892e70
commit 14f8f52
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 5 deletions.
diff --git a/t/lib/NoFork.pm b/t/lib/NoFork.pm
@@ -4,7 +4,21 @@ BEGIN {
     *CORE::GLOBAL::fork = sub { die "you should not fork" };
 }
 use Config;
-tied(%Config)->{d_fork} = 0;    # blatant lie
+if ($Config::Config{d_fork}) {
+  if (exists &Config::KEYS) {     # compiled Config
+    *Config_FETCHorig = \&Config::FETCH;
+    no warnings 'redefine';
+    *Config::FETCH = sub {
+      if ($_[0] and $_[1] eq 'd_fork') {
+        return 0;
+      } else {
+        return Config_FETCHorig(@_);
+      }
+    }
+  } else {
+    tied(%Config)->{d_fork} = 0;    # uncompiled Config
+  }
+}
 
 =begin TEST
 

diff --git a/t/multiplexer.t b/t/multiplexer.t
@@ -2,8 +2,12 @@
 
 use strict;
 use warnings;
+BEGIN {
+  chdir 'cpan/Test-Harness' unless -e 't/sample-tests/simple';
+}
 use lib 't/lib';
 
+use Config ();
 use Test::More qw( no_plan );
 
 use File::Spec;

diff --git a/t/nofork.t b/t/nofork.t
@@ -4,6 +4,7 @@
 # NOTE maybe a good candidate for xt/author or something.
 
 BEGIN {
+    chdir 'cpan/Test-Harness' unless -e 't/lib/NoFork.pm';
     use lib 't/lib';
 }
 
@@ -15,7 +16,8 @@ use Test::More (
     $Config{d_fork}
     ? 'no_plan'
     : ( 'skip_all' => 'your system already has no fork' )
-);
+  );
+
 use IO::c55Capture;    # for util
 
 use TAP::Harness;

diff --git a/t/regression.t b/t/regression.t
@@ -7,10 +7,13 @@ BEGIN {
 use strict;
 use warnings;
 
+use Config;
+if ($Config::Config{usecperl}) {
+    use Test::More 'skip_all' => 'cperl bug CM-834';
+}
 use Test::More 'no_plan';
 
 use File::Spec;
-use Config;
 
 use constant TRUE  => "__TRUE__";
 use constant FALSE => "__FALSE__";

diff --git a/t/sample-tests/switches b/t/sample-tests/switches
@@ -1,2 +1,2 @@
 print "1..1\n";
-print $INC{'strict.pm'} ? "ok 1\n" : "not ok 1\n";
+print $INC{'vars.pm'} ? "ok 1\n" : "not ok 1\n";
diff --git a/t/source_handler.t b/t/source_handler.t
@@ -355,7 +355,8 @@ sub test_handler {
 
         SKIP:
         {
-            %int::; # init the coretype if missing
+            no warnings 'void';
+            %int:: unless %int::; # init the coretype if missing
             my int $planned = 1;
             $planned += 1 + scalar @{ $test->{output} } if $test->{output};
             skip "$test->{skip_reason}", $planned if $test->{skip};