resolve conflict

[catagits/Catalyst-Runtime.git] / t / aggregate.t

diff --git a/t/aggregate.t b/t/aggregate.t
index 7943b5b..e071379 100644 (file)
--- a/t/aggregate.t
+++ b/t/aggregate.t
@@ -1,20 +1,26 @@
-#!perl
-
 use strict;
 use warnings;
 
 use FindBin;
 use lib "$FindBin::Bin/lib";
+use File::Spec::Functions 'catfile', 'updir';
+
+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.35_05'); 1 }) {
+    unless (eval { require Test::Aggregate; Test::Aggregate->VERSION('0.364'); 1 }) {
         require Test::More;
-        Test::More::plan(skip_all => 'Test::Aggregate 0.35_05 required for test aggregation');
+        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,