X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Flib%2FDBICTest%2FRunMode.pm;h=b15139202e859c89b0e713b52f4f81ed64545327;hb=7b87b77c04e07cfea1103dba8ecbd3f219e949d2;hp=178378e70d34e45796caf8dee38977f369db6ca1;hpb=c0329273268971824784f239f32c7246e68da9c5;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/lib/DBICTest/RunMode.pm b/t/lib/DBICTest/RunMode.pm
index 178378e..b151392 100644
--- a/t/lib/DBICTest/RunMode.pm
+++ b/t/lib/DBICTest/RunMode.pm
@@ -14,8 +14,6 @@ use DBICTest::Util qw( local_umask find_co_root );
 # return a Path::Class::Dir object or undef
 sub _find_co_root { eval { dir( find_co_root() ) } }
 
-_check_author_makefile() unless $ENV{DBICTEST_NO_MAKEFILE_VERIFICATION};
-
 # PathTools has a bug where on MSWin32 it will often return / as a tmpdir.
 # This is *really* stupid and the result of having our lockfiles all over
 # the place is also rather obnoxious. So we use our own heuristics instead
@@ -83,109 +81,13 @@ EOE
 }
 
 
-# Die if the author did not update his makefile
-#
-# This is pretty heavy handed, so the check is pretty solid:
-#
-# 1) Assume that this particular module is loaded from -I <$root>/t/lib
-# 2) Make sure <$root>/Makefile.PL exists
-# 3) Make sure we can stat() <$root>/Makefile.PL
-#
-# If all of the above is satisfied
-#
-# *) die if <$root>/inc does not exist
-# *) die if no stat() results for <$root>/Makefile (covers no Makefile)
-# *) die if Makefile.PL mtime > Makefile mtime
-#
-sub _check_author_makefile {
-
-  my $root = _find_co_root()
-    or return;
-
-  my $optdeps = file('lib/DBIx/Class/Optional/Dependencies.pm');
-
-  # not using file->stat as it invokes File::stat which in turn breaks stat(_)
-  my ($mf_pl_mtime, $mf_mtime, $optdeps_mtime) = ( map
-    { (stat ($root->file ($_)) )[9] || undef }  # stat returns () on nonexistent files
-    (qw|Makefile.PL  Makefile|, $optdeps)
-  );
-
-  return unless $mf_pl_mtime;   # something went wrong during co_root detection ?
-
-  my @fail_reasons;
-
-  if(not -d $root->subdir ('inc')) {
-    push @fail_reasons, "Missing ./inc directory";
-  }
-
-  if(not $mf_mtime) {
-    push @fail_reasons, "Missing ./Makefile";
-  }
-  else {
-    if($mf_mtime < $mf_pl_mtime) {
-      push @fail_reasons, "./Makefile.PL is newer than ./Makefile";
-    }
-    if($mf_mtime < $optdeps_mtime) {
-      push @fail_reasons, "./$optdeps is newer than ./Makefile";
-    }
-  }
-
-  if (@fail_reasons) {
-    print STDERR <<'EOE';
-
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-======================== FATAL ERROR ===========================
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-We have a number of reasons to believe that this is a development
-checkout and that you, the user, did not run `perl Makefile.PL`
-before using this code. You absolutely _must_ perform this step,
-to ensure you have all required dependencies present. Not doing
-so often results in a lot of wasted time for other contributors
-trying to assist you with spurious "its broken!" problems.
-
-By default DBICs Makefile.PL turns all optional dependencies into
-*HARD REQUIREMENTS*, in order to make sure that the entire test
-suite is executed, and no tests are skipped due to missing modules.
-If you for some reason need to disable this behavior - supply the
---skip_author_deps option when running perl Makefile.PL
-
-If you are seeing this message unexpectedly (i.e. you are in fact
-attempting a regular installation be it through CPAN or manually),
-please report the situation to either the mailing list or to the
-irc channel as described in
-
-http://search.cpan.org/dist/DBIx-Class/lib/DBIx/Class.pm#GETTING_HELP/SUPPORT
-
-The DBIC team
-
-
-Reasons you received this message:
-
-EOE
-
-    foreach my $r (@fail_reasons) {
-      print STDERR "  * $r\n";
-    }
-    print STDERR "\n\n\n";
-
-    require Time::HiRes;
-    Time::HiRes::sleep(0.005);
-    print STDOUT "\nBail out!\n";
-    exit 1;
-  }
-}
-
 # Mimic $Module::Install::AUTHOR
 sub is_author {
 
-  my $root = _find_co_root()
-    or return undef;
-
   return (
-    ( not -d $root->subdir ('inc') )
+    ! -d 'inc/Module'
       or
-    ( -e $root->subdir ('inc')->subdir ($^O eq 'VMS' ? '_author' : '.author') )
+    -e 'inc/.author'
   );
 }