X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=382a9fb56f84fc6022eb6484621188eb260df30d;hb=027e3cc615a8cda0282f5b0652dba6fe83db3382;hp=a88f64e3f06974c86945501da7905a122be4fe1b;hpb=d4a39575216302461a304c8c5211109ffb9d39f0;p=dbsrgits%2FDBIx-Class.git

diff --git a/Makefile.PL b/Makefile.PL
index a88f64e..382a9fb 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -61,14 +61,15 @@ my $runtime_requires = {
   'Context::Preserve'        => '0.01',
   'Data::Dumper::Concise'    => '2.020',
   'Data::Page'               => '2.00',
+  'Devel::GlobalDestruction' => '0',
   'Hash::Merge'              => '0.12',
-  'Moo'                      => '0.009014',
+  'Moo'                      => '0.009100',
   'MRO::Compat'              => '0.09',
   'Module::Find'             => '0.06',
   'namespace::clean'         => '0.20',
   'Path::Class'              => '0.18',
   'Scope::Guard'             => '0.03',
-  'SQL::Abstract'            => '1.72',
+  'SQL::Abstract'            => '1.73_01',
   'Try::Tiny'                => '0.04',
 
   # dual-life corelibs needing a specific bugfixed version
@@ -119,27 +120,6 @@ if ($ENV{DBICTEST_SQLT_DEPLOY}) {
   }
 }
 
-# Bail out on parallel testing
-if (
-  ($ENV{HARNESS_OPTIONS}||'') =~ / (?: ^ | \: ) j(\d+) /x
-    and
-  $1 > 1
-) { die <<EOP }
-
-******************************************************************************
-******************************************************************************
-***                                                                        ***
-***      PARALLEL TESTING DETECTED ( \$ENV{HARNESS_OPTIONS} = 'j$1' )        ***
-***                                                                        ***
-*** DBIC tests WILL FAIL. It is harder to make them parallel-friendly than ***
-*** it should be (though work is underway). In the meantime you will have  ***
-*** to adjust your environment and re-run the installation. Sorry!         ***
-***                                                                        ***
-******************************************************************************
-******************************************************************************
-
-EOP
-
 # this is so we can order requires alphabetically
 # copies are needed for potential author requires injection
 my $reqs = {
@@ -169,9 +149,13 @@ if ($Module::Install::AUTHOR  and ! $ENV{MAKELEVEL}) {
   # string-eval, not do(), because we need to provide the
   # $reqs and $*_requires lexicals to the included file
   # (some includes *do* modify $reqs above)
-  for (sort glob ( File::Spec->catfile('maint', 'Makefile.PL.inc', '*') ) ) {
-    eval scalar do { local (@ARGV, $/) = $_; <> }
-      or die ($@ || $!);
+  for my $inc (sort glob ( File::Spec->catfile('maint', 'Makefile.PL.inc', '*') ) ) {
+    my $src = do { local (@ARGV, $/) = $inc; <> } or die $!;
+    eval "use warnings; use strict; $src" or die sprintf
+      "Failed execution of %s: %s\n",
+      $inc,
+      ($@ || $! || 'Unknown error'),
+    ;
   }
 }
 else {