X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=a7f87ed6a5ef880dbf024c8a8045508c05f2e8bb;hb=dd94f6ef1eebdc025522baf123aa949e3e918bc6;hp=172cb66b6c8b654332e9c7c17342191e410bad80;hpb=7975645bb827d021778c61d94eefc27ae330d00d;p=dbsrgits%2FDBIx-Class.git

diff --git a/Makefile.PL b/Makefile.PL
index 172cb66..a7f87ed 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -62,7 +62,7 @@ my $runtime_requires = {
   'Data::Page'               => '2.00',
   'Devel::GlobalDestruction' => '0.09',
   'Hash::Merge'              => '0.12',
-  'Moo'                      => '1.006001',
+  'Moo'                      => '2.000',
   'MRO::Compat'              => '0.12',
   'Module::Find'             => '0.07',
   'namespace::clean'         => '0.24',
@@ -96,26 +96,37 @@ my $test_requires = {
   %{ DBIx::Class::Optional::Dependencies->req_list_for('test_rdbms_sqlite') },
 };
 
-# if the user has this env var set and no SQLT installed, tests will fail
-# Note - this is added as test_requires *directly*, so it gets properly
+# if the user has some of these env vars set and the deps are not available,
+# tests will fail
+# Note - these are added as test_requires *directly*, so they get properly
 # excluded on META.yml cleansing (even though no dist can be created from this)
-# we force this req regarless of author_deps, worst case scenario it will
+# we force these reqs regarless of author_deps, worst case scenario they will
 # be specified twice
 #
-# also note that we *do* set dynamic_config => 0, as this is the only thing
-# that we determine dynamically, and in all fairness if someone sets the
-# envvar *and* is not running a full Makefile/make/maketest cycle - they get
+# also note that we *do* set dynamic_config => 0, as these are the only things
+# that we determine dynamically, and in all fairness if someone sets these
+# envvars *and* is not running a full Makefile/make/maketest cycle - they get
 # to keep the pieces
-if ($ENV{DBICTEST_SQLT_DEPLOY}) {
-  my $deploy_req = DBIx::Class::Optional::Dependencies->req_list_for('deploy');
-  for (keys %$deploy_req) {
-    test_requires ($_ => $deploy_req->{$_})
+if ( my @optdeps = (
+  $ENV{DBICTEST_SQLT_DEPLOY} ? 'deploy' : (),
+  $ENV{DBICTEST_VIA_REPLICATED} ? 'replicated' : (),
+)) {
+  my $extra_deps = DBIx::Class::Optional::Dependencies->req_list_for(\@optdeps);
+  for (keys %$extra_deps) {
+    test_requires ($_ => $extra_deps->{$_})
   }
 }
 
-tests_recursive (qw|
-    t
-|);
+tests_recursive ('t');
+tests_recursive ('xt') if (
+  $Module::Install::AUTHOR
+    or
+  $ENV{DBICTEST_RUN_ALL_TESTS}
+    or
+  ( $ENV{TRAVIS}||'' ) eq 'true'
+    or
+  ( $ENV{AUTOMATED_TESTING} and ! $ENV{PERL5_CPANM_IS_RUNNING} and ! $ENV{RELEASE_TESTING} )
+);
 
 install_script (qw|
     script/dbicadmin