Reorganize runmode detection a bit

[dbsrgits/DBIx-Class.git] / xt / eol.t

diff --git a/xt/eol.t b/xt/eol.t
index 609f6ad..e61ce41 100644 (file)
--- a/xt/eol.t
+++ b/xt/eol.t
@@ -6,7 +6,7 @@ use lib 't/lib';
 use DBICTest;
 
 # Don't run tests for installs
-unless ( DBICTest::AuthorCheck->is_author || $ENV{AUTOMATED_TESTING} || $ENV{RELEASE_TESTING} ) {
+if ( DBICTest::RunMode->is_plain ) {
   plan( skip_all => "Author tests not required for installation" );
 }
 
@@ -15,7 +15,7 @@ plan skip_all => 'Test::EOL very broken';
 require DBIx::Class;
 unless ( DBIx::Class::Optional::Dependencies->req_ok_for ('test_eol') ) {
   my $missing = DBIx::Class::Optional::Dependencies->req_missing_for ('test_eol');
-  $ENV{RELEASE_TESTING} || DBICTest::AuthorCheck->is_author
+  (! DBICTest::RunMode->is_plain && ! DBICTest::RunMode->is_smoker )
     ? die ("Failed to load release-testing module requirements: $missing")
     : plan skip_all => "Test needs: $missing"
 }
@@ -24,7 +24,7 @@ TODO: {
   local $TODO = 'Do not fix those yet - we have way too many branches out there, merging will be hell';
   Test::EOL::all_perl_files_ok({ trailing_whitespace => 1},
     qw/t xt lib script/,
-    DBICTest::AuthorCheck->is_author ? ('maint') : (),
+    DBICTest::RunMode->is_author ? ('maint') : (),
   );
 }