[Catalyst-commits] r9793 - Catalyst-Runtime/5.80/trunk

[rafl at dev.catalyst.perl.org]

Author: rafl
Date: 2009-04-22 17:41:02 +0100 (Wed, 22 Apr 2009)
New Revision: 9793

Modified:
   Catalyst-Runtime/5.80/trunk/Changes
   Catalyst-Runtime/5.80/trunk/Makefile.PL
Log:
Turn of test aggregation by default.

Only aggregate if the TEST_AGGREGATE environment variable is set and a recent
Test::Aggregate is available.

Modified: Catalyst-Runtime/5.80/trunk/Changes
===================================================================
--- Catalyst-Runtime/5.80/trunk/Changes	2009-04-22 16:18:16 UTC (rev 9792)
+++ Catalyst-Runtime/5.80/trunk/Changes	2009-04-22 16:41:02 UTC (rev 9793)
@@ -1,5 +1,9 @@
 # This file documents the revision history for Perl extension Catalyst.
 
+        - Turn of test aggregation by default. Only aggregate if the
+          AGGREGATE_TESTS environment variable is set and a recent
+          Test::Aggregate is available. (rafl)
+
 5.80002 2009-04-22 01:28:36
         - Fix CATALYST_DEBUG and MYAPP_DEBUG environment variables
           turning debuging on if defined, rather than if set.

Modified: Catalyst-Runtime/5.80/trunk/Makefile.PL
===================================================================
--- Catalyst-Runtime/5.80/trunk/Makefile.PL	2009-04-22 16:18:16 UTC (rev 9792)
+++ Catalyst-Runtime/5.80/trunk/Makefile.PL	2009-04-22 16:41:02 UTC (rev 9793)
@@ -40,17 +40,16 @@
 test_requires 'Class::Data::Inheritable';
 test_requires 'Test::MockObject';
 
-# Run aggregate tests if AGGREGATE_TESTS environment = 1, but not if it = 0
-# Otherwise default to using Test::Aggregate if installed, but not requiring it.
-if (   ( exists $ENV{AGGREGATE_TESTS} && !$ENV{AGGREGATE_TESTS})
-    || (!exists $ENV{AGGREGATE_TESTS} && !can_use('Test::Aggregate', '0.34_01'))) {
+# aggregate tests if AGGREGATE_TESTS is set and a recent Test::Aggregate is available
+if ($ENV{AGGREGATE_TESTS} && can_use('Test::Aggregate', '0.34_01')) {
+    test_requires('Test::Aggregate', '0.34_01');
+}
+else {
     tests join q{ },
         grep { $_ ne 't/aggregate.t' }
         map  { glob } qw[t/*.t t/aggregate/*.t];
 }
-else {
-    test_requires('Test::Aggregate', '0.34_01');
-}
+
 my @force_build_requires_if_author = qw(
   Test::NoTabs
   Test::Pod