X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=dc44dee90949df4292f8894e009b29fb5f3efc00;hb=ce9f555e55e767a287831c0fcccb337cc36905de;hp=889828546044842135da83a4377d3b7fad63cfec;hpb=8dc59f2da55b17718ddc4f4a55e16496b9fdbde3;p=dbsrgits%2FDBIx-Class.git

diff --git a/Makefile.PL b/Makefile.PL
index 8898285..dc44dee 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -8,23 +8,6 @@ use FindBin;
 use lib "$FindBin::Bin/lib";
 use DBIx::Class::Optional::Dependencies;
 
-# adjust ENV for $AUTHOR system() calls
-use Config;
-$ENV{PERL5LIB} = join ($Config{path_sep}, @INC);
-
-use Getopt::Long ();
-
-my $getopt = Getopt::Long::Parser->new(
-  config => [qw/gnu_getopt bundling_override no_ignore_case pass_through/]
-);
-my $args = {
-  skip_author_deps => undef,
-};
-$getopt->getoptions($args, 'skip_author_deps');
-if (@ARGV) {
-  warn "\nIgnoring unrecognized option(s): @ARGV\n\n";
-}
-
 # get cpanX --installdeps . to behave in a checkout (most users do not need
 # the deps for a full test suite run, and if they do - there's MI::AutoInstall
 # for that)
@@ -70,21 +53,56 @@ my $runtime_requires = {
   'Hash::Merge'              => '0.12',
   'MRO::Compat'              => '0.09',
   'Module::Find'             => '0.06',
+  'namespace::clean'         => '0.20',
   'Path::Class'              => '0.18',
   'Scope::Guard'             => '0.03',
   'SQL::Abstract'            => '1.72',
   'Try::Tiny'                => '0.04',
-  'Data::Compare'            => '1.22',
 
   # XS (or XS-dependent) libs
   'DBI'                      => '1.57',
-  'namespace::clean'         => '0.20',
   'Sub::Name'                => '0.04',
-  'Variable::Magic'          => '0.44',
 
   # dual-life corelibs needing a specific bugfixed version
   'File::Path'               => '2.07',
+
+  # FIXME - temporary, needs throwing out for something more efficient
+  'Data::Compare'            => '1.22',
+};
+
+
+# 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
+
+require Getopt::Long;
+my $getopt = Getopt::Long::Parser->new(
+  config => [qw/gnu_getopt bundling_override no_ignore_case pass_through/]
+);
+my $args = {
+  skip_author_deps => undef,
 };
+$getopt->getoptions($args, 'skip_author_deps');
+if (@ARGV) {
+  warn "\nIgnoring unrecognized option(s): @ARGV\n\n";
+}
 
 # this is so we can order requires alphabetically
 # copies are needed for author requires injection
@@ -172,6 +190,10 @@ warn $optdep_msg if $Module::Install::AUTHOR;
 # re-create various autogenerated documentation bits
 if ($Module::Install::AUTHOR) {
 
+  # adjust ENV for $AUTHOR system() calls
+  require Config;
+  $ENV{PERL5LIB} = join ($Config::Config{path_sep}, @INC);
+
   print "Regenerating README\n";
   system('pod2text lib/DBIx/Class.pm > README');
 
@@ -258,6 +280,7 @@ no_index directory => $_ for (qw|
 no_index package => $_ for (qw/
   DBIx::Class::Storage::DBIHacks
   DBIx::Class::Carp
+  DBIx::Class::ResultSet::Pager
 /);
 
 WriteAll();