X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=t%2Faggregate.t;h=543fe024f3358c07a55916f22203b25d23013867;hp=9b31a52b318df99cef418a6102219ddbebfd148c;hb=11d52bbdb4fccbe1678d869494acb9d43ae83c99;hpb=ae29b412955743885e80350085167b54b69672da

diff --git a/t/aggregate.t b/t/aggregate.t
index 9b31a52..543fe02 100644
--- a/t/aggregate.t
+++ b/t/aggregate.t
@@ -5,11 +5,24 @@ use warnings;
 
 use FindBin;
 use lib "$FindBin::Bin/lib";
+use File::Spec::Functions 'catfile', 'updir';
 
-use Test::Aggregate;
+BEGIN {
+    unless (-e catfile $FindBin::Bin, updir, '.aggregating') {
+        require Test::More;
+        Test::More::plan(skip_all => 'No test aggregation requested');
+    }
+}
+
+BEGIN {
+    unless (eval { require Test::Aggregate; Test::Aggregate->VERSION('0.364'); 1 }) {
+        require Test::More;
+        Test::More::plan(skip_all => 'Test::Aggregate 0.364 required for test aggregation');
+    }
+}
 
 my $tests = Test::Aggregate->new({
-    dirs          => 't/aggregate',
+    (@ARGV ? (tests => \@ARGV) : (dirs => 't/aggregate')),
     verbose       => 0,
     set_filenames => 1,
     findbin       => 1,