Use the standard 'RELEASE_TESTING' env variable.

5 files changed, 14 insertions, 11 deletions

diff --git a/t/00_release.t b/t/00_release.t
index 808f02c38..8f8f6a0eb 100644
--- a/t/00_release.t
+++ b/t/00_release.t
@@ -11,9 +11,10 @@ use Data::Dumper;
 use Test::More;
 use lib 't','.';
 
-if (!$ENV{TEST_AUTHOR}) {
-	plan skip_all => 'Set the environment variable TEST_AUTHOR to enable this test';
+if (!$ENV{RELEASE_TESTING}) {
+	plan (skip_all =>  'Test skipped unless environment variable RELEASE_TESTING is set');
 }
+
 plan tests => 2;
 
 my %v;
diff --git a/t/00_signature.t b/t/00_signature.t
index 74fbe7aaa..9aeab37f9 100644
--- a/t/00_signature.t
+++ b/t/00_signature.t
@@ -1,7 +1,6 @@
 #!perl
 
 ## Test that our PGP signature file is valid
-## Requires ENV TEST_SIGNATURE or TEST_EVERYTHING to be set
 
 use 5.006;
 use strict;
@@ -10,9 +9,10 @@ use Test::More;
 
 my $sigfile = 'check_postgres.pl.asc';
 
-if (!$ENV{TEST_SIGNATURE} and !$ENV{TEST_EVERYTHING}) {
-	plan skip_all => 'Set the environment variable TEST_SIGNATURE to enable this test';
+if (!$ENV{RELEASE_TESTING}) {
+	plan (skip_all =>  'Test skipped unless environment variable RELEASE_TESTING is set');
 }
+
 plan tests => 2;
 
 SKIP: {
diff --git a/t/99_perlcritic.t b/t/99_perlcritic.t
index 982afb667..a98c06497 100644
--- a/t/99_perlcritic.t
+++ b/t/99_perlcritic.t
@@ -2,7 +2,6 @@
 
 ## Run Perl::Critic against the source code and the tests
 ## This is highly customized, so take with a grain of salt
-## Requires ENV TEST_CRITIC or TEST_EVERYTHING to be set
 
 use 5.006;
 use strict;
@@ -12,8 +11,8 @@ use Data::Dumper;
 
 my @testfiles;
 
-if (!$ENV{TEST_CRITIC} and !$ENV{TEST_EVERYTHING}) {
-	plan skip_all => 'Set the environment variable TEST_CRITIC to enable this test';
+if (!$ENV{RELEASE_TESTING}) {
+	plan (skip_all =>  'Test skipped unless environment variable RELEASE_TESTING is set');
 }
 elsif (!eval { require Perl::Critic; 1 }) {
 	plan skip_all => 'Could not find Perl::Critic';
diff --git a/t/99_pod.t b/t/99_pod.t
index 484df6e28..3cd7bdef5 100644
--- a/t/99_pod.t
+++ b/t/99_pod.t
@@ -7,6 +7,10 @@ use strict;
 use warnings;
 use Test::More tests => 2;
 
+if (!$ENV{RELEASE_TESTING}) {
+	plan (skip_all =>  'Test skipped unless environment variable RELEASE_TESTING is set');
+}
+
 my $PODVERSION = '0.95';
 eval {
 	require Test::Pod;
diff --git a/t/99_spellcheck.t b/t/99_spellcheck.t
index e8eb3b689..0234d047c 100644
--- a/t/99_spellcheck.t
+++ b/t/99_spellcheck.t
@@ -1,7 +1,6 @@
 #!perl
 
 ## Spellcheck as much as we can
-## Requires ENV TEST_SPELL or TEST_EVERYTHING to be set
 
 use 5.006;
 use strict;
@@ -10,8 +9,8 @@ use Test::More;
 
 my (@testfiles, $fh);
 
-if (!$ENV{TEST_SPELL} and !$ENV{TEST_EVERYTHING}) {
-	plan skip_all => 'Set the environment variable TEST_SPELL to enable this test';
+if (!$ENV{RELEASE_TESTING}) {
+	plan (skip_all =>  'Test skipped unless environment variable RELEASE_TESTING is set');
 }
 elsif (!eval { require Text::SpellChecker; 1 }) {
 	plan skip_all => 'Could not find Text::SpellChecker';