Add skip_all_without_config() to test.pl, and use it in 6 tests.

This abstracts out the common idiom of loading Config, checking if a particular
key is true, and if not implementing a "skip all" with an appropriate reason.

diff --git a/t/op/getpid.t b/t/op/getpid.t
index b51b064..ac066d5 100644 (file)
--- a/t/op/getpid.t
+++ b/t/op/getpid.t
@@ -12,14 +12,7 @@ use strict;
 use Config;
 
 BEGIN {
-    if (!$Config{useithreads}) {
-       print "1..0 # Skip: no ithreads\n";
-       exit;
-    }
-    if (!$Config{d_getppid}) {
-       print "1..0 # Skip: no getppid\n";
-       exit;
-    }
+    skip_all_without_config($_) foreach qw(useithreads d_getppid);
     if ($ENV{PERL_CORE_MINITEST}) {
         print "1..0 # Skip: no dynamic loading on miniperl, no threads\n";
         exit 0;

diff --git a/t/op/getppid.t b/t/op/getppid.t
index f4ebc7e..23428f0 100644 (file)
--- a/t/op/getppid.t
+++ b/t/op/getppid.t
@@ -13,16 +13,10 @@ BEGIN {
 }
 
 use strict;
-use Config;
 
 BEGIN {
-    for my $syscall (qw(pipe fork waitpid getppid)) {
-       if (!$Config{"d_$syscall"}) {
-           print "1..0 # Skip: no $syscall\n";
-           exit;
-       }
-    }
     require './test.pl';
+    skip_all_without_config($_) foreach qw(d_pipe d_fork d_waitpid d_getppid);
     plan (8);
 }
 

diff --git a/t/op/threads-dirh.t b/t/op/threads-dirh.t
index 900a62a..b481992 100644 (file)
--- a/t/op/threads-dirh.t
+++ b/t/op/threads-dirh.t
@@ -9,10 +9,7 @@ BEGIN {
      $| = 1;
 
      require Config;
-     if (!$Config::Config{useithreads}) {
-        print "1..0 # Skip: no ithreads\n";
-        exit 0;
-     }
+     skip_all_without_config('useithreads');
      skip_all_if_miniperl("no dynamic loading on miniperl, no threads");
 
      plan(6);

diff --git a/t/op/threads.t b/t/op/threads.t
index 94dad6e..24e84e4 100644 (file)
--- a/t/op/threads.t
+++ b/t/op/threads.t
@@ -6,11 +6,7 @@ BEGIN {
      require './test.pl';
      $| = 1;
 
-     require Config;
-     if (!$Config::Config{useithreads}) {
-        print "1..0 # Skip: no ithreads\n";
-        exit 0;
-     }
+     skip_all_without_config('useithreads');
      skip_all_if_miniperl("no dynamic loading on miniperl, no threads");
 
      plan(24);

diff --git a/t/run/cloexec.t b/t/run/cloexec.t
index 314d5fa..486df1e 100644 (file)
--- a/t/run/cloexec.t
+++ b/t/run/cloexec.t
@@ -35,12 +35,8 @@
 BEGIN {
     chdir 't' if -d 't';
     @INC = '../lib';
-    require Config;
-    if (!$Config::Config{'d_fcntl'}) {
-        print("1..0 # Skip: fcntl() is not available\n");
-        exit(0);
-    }
     require './test.pl';
+    skip_all_without_config('d_fcntl');
 }
 
 use strict;

diff --git a/t/run/runenv.t b/t/run/runenv.t
index b3e47a6..cea2590 100644 (file)
--- a/t/run/runenv.t
+++ b/t/run/runenv.t
@@ -8,11 +8,8 @@ BEGIN {
     chdir 't' if -d 't';
     @INC = '../lib';
     require Config; import Config;
-    unless ($Config{'d_fork'}) {
-        print "1..0 # Skip: no fork\n";
-           exit 0;
-    }
-    require './test.pl'
+    require './test.pl';
+    skip_all_without_config('d_fork');
 }
 
 plan tests => 84;

diff --git a/t/test.pl b/t/test.pl
index a09c831..fa151ec 100644 (file)
--- a/t/test.pl
+++ b/t/test.pl
@@ -136,6 +136,21 @@ sub skip_all_without_perlio {
     skip_all('no PerlIO') unless PerlIO::Layer->find('perlio');
 }
 
+sub skip_all_without_config {
+    my ($key, $reason) = @_;
+    unless (eval 'require Config; 1') {
+       warn "test.pl had problems loading Config: $@";
+       return;
+    }
+    return if $Config::Config{$key};
+    unless (defined $reason) {
+       $key =~ s/^use//;
+       $key =~ s/^d_//;
+       $reason = "no $key";
+    }
+    skip_all($reason);
+}
+
 sub _ok {
     my ($pass, $where, $name, @mess) = @_;
     # Do not try to microoptimize by factoring out the "not ".