From ed0c695fd30a2cde3f841c3e6ee6b63b282266e8 Mon Sep 17 00:00:00 2001
From: Brad Gilbert <b2gills@gmail.com>
Date: Sat, 2 May 2009 18:26:25 -0500
Subject: [PATCH] Reworked test files for better error reporting

---
 perl/README             |  4 ++--
 perl/lib/Nasm/crc64.pm  |  3 +--
 perl/t/perl-critic.t    |  5 ++---
 perl/t/pod-coverage.t   |  6 ++----
 perl/t/pod.t            |  5 ++---
 perl/t/version/h.t      | 19 +++++++++++++++++--
 perl/t/version/json.t   | 19 +++++++++++++++++--
 perl/t/version/mac.t    | 19 ++++++++++++++++---
 perl/t/version/make.t   | 18 ++++++++++++++++--
 perl/t/version/nsis.t   | 19 +++++++++++++++++--
 perl/t/version/perl.t   | 19 +++++++++++++++++--
 perl/t/version/pod.t    |  5 ++---
 perl/t/version/sed.t    | 18 ++++++++++++++++--
 perl/t/version/simple.t | 20 ++++++++++++++++++--
 perl/t/version/yaml.t   | 19 ++++++++++++++++---
 15 files changed, 161 insertions(+), 37 deletions(-)

diff --git a/perl/README b/perl/README
index 1638bcab..8fba245b 100644
--- a/perl/README
+++ b/perl/README
@@ -2,10 +2,10 @@ cd perl;
 prove;
 
 to run all tests:
-  env RELEASE_TESTING=1 prove;
+  RELEASE_TESTING=1 prove;
 
 to only run normal + pod tests:
-  env POD_TESTING=1 prove;
+  POD_TESTING=1 prove;
 
 Finished / Usable
   version.pl
diff --git a/perl/lib/Nasm/crc64.pm b/perl/lib/Nasm/crc64.pm
index 2a37c6fb..b4901654 100644
--- a/perl/lib/Nasm/crc64.pm
+++ b/perl/lib/Nasm/crc64.pm
@@ -17,8 +17,7 @@ package Nasm::crc64;
 use warnings;
 use strict;
 
-require Exporter;
-our @ISA    = qw(Exporter);
+use base 'Exporter';
 our @EXPORT = qw(crc64);
 
 
diff --git a/perl/t/perl-critic.t b/perl/t/perl-critic.t
index e58a2163..10cd50bb 100644
--- a/perl/t/perl-critic.t
+++ b/perl/t/perl-critic.t
@@ -14,10 +14,9 @@ my @MODULES = (
 # Don't run tests during end-user installs
 use Test::More;
 unless (
-  $ENV{RELEASE_TESTING} or
-  $ENV{AUTHOR_TESTING}
+  $ENV{RELEASE_TESTING}
 ){
-  plan( skip_all => "Author tests not required for installation" );
+  plan( skip_all => "test not required for installation" );
 }
 
 # Load the testing modules
diff --git a/perl/t/pod-coverage.t b/perl/t/pod-coverage.t
index 19614c66..dd2cd835 100644
--- a/perl/t/pod-coverage.t
+++ b/perl/t/pod-coverage.t
@@ -15,12 +15,10 @@ my @MODULES = (
 # Don't run tests during end-user installs
 use Test::More;
 unless(
-  $ENV{AUTOMATED_TESTING} or
   $ENV{RELEASE_TESTING} or
-  $ENV{POD_TESTING} or
-  $ENV{AUTHOR_TESTING}
+  $ENV{POD_TESTING}
 ){
-  plan( skip_all => "Author tests not required for installation" );
+  plan( skip_all => "test not required for installation" );
 }
 
 # Load the testing modules
diff --git a/perl/t/pod.t b/perl/t/pod.t
index 63321317..7b5e600f 100644
--- a/perl/t/pod.t
+++ b/perl/t/pod.t
@@ -17,10 +17,9 @@ use Test::More;
 unless(
   $ENV{AUTOMATED_TESTING} or
   $ENV{RELEASE_TESTING} or
-  $ENV{POD_TESTING} or
-  $ENV{AUTHOR_TESTING}
+  $ENV{POD_TESTING}
 ){
-  plan( skip_all => "Author tests not required for installation" );
+  plan( skip_all => "test not required for installation" );
 }
 
 # Load the testing modules
diff --git a/perl/t/version/h.t b/perl/t/version/h.t
index 9d0c088c..b6d9edb6 100644
--- a/perl/t/version/h.t
+++ b/perl/t/version/h.t
@@ -3,7 +3,22 @@ use strict;
 use warnings;
 
 use lib qw't perl/t ..';
-use version::input;
+
+my @MODULES = (
+  'YAML::XS',
+  'version::input',
+);
+
+use Test::More;
+
+# Load the testing modules
+foreach my $MODULE ( @MODULES ) {
+  eval "use $MODULE";
+  if ( $@ ) {
+    plan( skip_all => "$MODULE not available for testing" );
+  }
+}
+
 
 our %test = load(
   filter => [qw' major minor subminor patchlevel xid snapshot'],
@@ -12,7 +27,7 @@ our %test = load(
   }
 );
 
-use Test::More;
+
 plan( tests => scalar keys %test );
 
 
diff --git a/perl/t/version/json.t b/perl/t/version/json.t
index 48cc7fe0..339fdbcb 100644
--- a/perl/t/version/json.t
+++ b/perl/t/version/json.t
@@ -3,14 +3,29 @@ use strict;
 use warnings;
 
 use lib qw't perl/t ..';
-use version::input;
 
-use JSON;
+my @MODULES = (
+  'YAML::XS',
+  'version::input',
+  'JSON',
+);
+
+use Test::More;
+
+# Load the testing modules
+foreach my $MODULE ( @MODULES ) {
+  eval "use $MODULE";
+  if ( $@ ) {
+    plan( skip_all => "$MODULE not available for testing" );
+  }
+}
+
 
 our %test = load(
   'all'
 );
 
+
 use Test::More;
 plan( tests => scalar keys %test );
 
diff --git a/perl/t/version/mac.t b/perl/t/version/mac.t
index 1352c362..c48d981c 100644
--- a/perl/t/version/mac.t
+++ b/perl/t/version/mac.t
@@ -3,7 +3,22 @@ use strict;
 use warnings;
 
 use lib qw't perl/t ..';
-use version::input;
+
+my %MODULES = (
+  'YAML::XS', 'qw[:all]',
+  'version::input', '',
+);
+
+use Test::More;
+
+# Load the testing modules
+foreach my $MODULE ( keys %MODULES ) {
+  eval "use $MODULE $MODULES{$MODULE}";
+  if ( $@ ) {
+    plan( skip_all => "$MODULE not available for testing" );
+  }
+}
+
 
 our %test = load(
   filter => [qw' major minor subminor patchlevel snapshot'],
@@ -16,8 +31,6 @@ our %test = load(
 );
 
 
-
-use Test::More;
 plan( tests => scalar keys %test );
 
 
diff --git a/perl/t/version/make.t b/perl/t/version/make.t
index 1a2ea47c..bfca93e7 100644
--- a/perl/t/version/make.t
+++ b/perl/t/version/make.t
@@ -3,14 +3,28 @@ use strict;
 use warnings;
 
 use lib qw't perl/t ..';
-use version::input;
+
+my %MODULES = (
+  'YAML::XS', 'qw[:all]',
+  'version::input', '',
+);
+
+use Test::More;
+
+# Load the testing modules
+foreach my $MODULE ( keys %MODULES ) {
+  eval "use $MODULE $MODULES{$MODULE}";
+  if ( $@ ) {
+    plan( skip_all => "$MODULE not available for testing" );
+  }
+}
+
 
 our %test = load(
   filter =>[qw'version major minor subminor patchlevel']
 );
 
 
-use Test::More;
 plan( tests => scalar keys %test );
 
 
diff --git a/perl/t/version/nsis.t b/perl/t/version/nsis.t
index ff41e2a7..8ef364ca 100644
--- a/perl/t/version/nsis.t
+++ b/perl/t/version/nsis.t
@@ -3,7 +3,22 @@ use strict;
 use warnings;
 
 use lib qw't perl/t ..';
-use version::input;
+
+my %MODULES = (
+  'YAML::XS', 'qw[:all]',
+  'version::input', '',
+);
+
+use Test::More;
+
+# Load the testing modules
+foreach my $MODULE ( keys %MODULES ) {
+  eval "use $MODULE $MODULES{$MODULE}";
+  if ( $@ ) {
+    plan( skip_all => "$MODULE not available for testing" );
+  }
+}
+
 
 our %test = load(
   filter =>[qw'major minor subminor patchlevel'],
@@ -12,7 +27,7 @@ our %test = load(
   }
 );
 
-use Test::More;
+
 plan( tests => scalar keys %test );
 
 
diff --git a/perl/t/version/perl.t b/perl/t/version/perl.t
index 36c8f386..66ab0309 100644
--- a/perl/t/version/perl.t
+++ b/perl/t/version/perl.t
@@ -3,13 +3,28 @@ use strict;
 use warnings;
 
 use lib qw't perl/t ..';
-use version::input;
+
+my %MODULES = (
+  'YAML::XS', 'qw[:all]',
+  'version::input', '',
+);
+
+use Test::More;
+
+# Load the testing modules
+foreach my $MODULE ( keys %MODULES ) {
+  eval "use $MODULE $MODULES{$MODULE}";
+  if ( $@ ) {
+    plan( skip_all => "$MODULE not available for testing" );
+  }
+}
+
 
 our %test = load(
   'all'
 );
 
-use Test::More;
+
 plan( tests => scalar keys %test );
 
 
diff --git a/perl/t/version/pod.t b/perl/t/version/pod.t
index 0a5f7c74..c7e0f582 100644
--- a/perl/t/version/pod.t
+++ b/perl/t/version/pod.t
@@ -17,10 +17,9 @@ use Test::More;
 unless(
   $ENV{AUTOMATED_TESTING} or
   $ENV{RELEASE_TESTING} or
-  $ENV{POD_TESTING} or
-  $ENV{AUTHOR_TESTING}
+  $ENV{POD_TESTING}
 ){
-  plan( skip_all => "Author tests not required for installation" );
+  plan( skip_all => "test not required for installation" );
 }
 
 # Load the testing modules
diff --git a/perl/t/version/sed.t b/perl/t/version/sed.t
index 2b22dabf..ffad25e1 100644
--- a/perl/t/version/sed.t
+++ b/perl/t/version/sed.t
@@ -3,7 +3,22 @@ use strict;
 use warnings;
 
 use lib qw't perl/t ..';
-use version::input;
+
+my %MODULES = (
+  'YAML::XS', 'qw[:all]',
+  'version::input', '',
+);
+
+use Test::More;
+
+# Load the testing modules
+foreach my $MODULE ( keys %MODULES ) {
+  eval "use $MODULE $MODULES{$MODULE}";
+  if ( $@ ) {
+    plan( skip_all => "$MODULE not available for testing" );
+  }
+}
+
 
 our %test = load(
   filter =>[qw'version major minor subminor patchlevel id xid mangled'],
@@ -13,7 +28,6 @@ our %test = load(
 );
 
 
-use Test::More;
 plan( tests => scalar keys %test );
 
 
diff --git a/perl/t/version/simple.t b/perl/t/version/simple.t
index ed0a0a9f..bc15045a 100644
--- a/perl/t/version/simple.t
+++ b/perl/t/version/simple.t
@@ -3,15 +3,31 @@ use strict;
 use warnings;
 
 use lib qw't perl/t ..';
-use version::input;
+
+my @MODULES = (
+  'YAML::XS',
+  'version::input',
+);
+
+use Test::More;
+
+# Load the testing modules
+foreach my $MODULE ( @MODULES ) {
+  eval "use $MODULE";
+  if ( $@ ) {
+    plan( skip_all => "$MODULE not available for testing" );
+  }
+}
+
 
 our %test = load(
   filter => [qw'id xid']
 );
 
-use Test::More;
+
 plan( tests => 2 * scalar keys %test );
 
+
 for my $test ( sort keys %test ){
   my $expected = $test{$test};
   
diff --git a/perl/t/version/yaml.t b/perl/t/version/yaml.t
index 9f72b92e..3fce8bd3 100644
--- a/perl/t/version/yaml.t
+++ b/perl/t/version/yaml.t
@@ -3,15 +3,28 @@ use strict;
 use warnings;
 
 use lib qw't perl/t ..';
-use version::input;
 
-require YAML::XS;
+my @MODULES = (
+  'YAML::XS',
+  'version::input',
+);
+
+use Test::More;
+
+# Load the testing modules
+foreach my $MODULE ( @MODULES ) {
+  eval "use $MODULE";
+  if ( $@ ) {
+    plan( skip_all => "$MODULE not available for testing" );
+  }
+}
+
 
 our %test = load(
   'all'
 );
 
-use Test::More;
+
 plan( tests => scalar keys %test );
 
 
-- 
2.11.4.GIT