Merge master into psgi branch

[catagits/Catalyst-Runtime.git] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 1aa679d..1d291f7 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -53,14 +53,17 @@ requires 'MRO::Compat';
 requires 'MooseX::Getopt' => '0.30';
 requires 'MooseX::Types';
 requires 'MooseX::Types::Common::Numeric';
+requires 'MooseX::Daemonize' => '0.13';
 requires 'String::RewritePrefix' => '0.004'; # Catalyst::Utils::resolve_namespace
-requires 'Plack' => '0.9935'; # Setup empty PATH_INFO if needed
+requires 'Plack' => '0.9974'; # IIS6 fix middleware
 requires 'Plack::Middleware::ReverseProxy' => '0.04';
+requires 'Plack::Test::ExternalServer';
 
 test_requires 'Class::Data::Inheritable';
 test_requires 'Test::Exception';
 test_requires 'Test::More' => '0.88';
 test_requires 'Data::Dump';
+test_requires 'HTTP::Request::Common';
 
 # aggregate tests if AGGREGATE_TESTS is set and a recent Test::Aggregate and a Test::Simple it works with is available
 if ($ENV{AGGREGATE_TESTS} && can_use('Test::Simple', '0.88') && can_use('Test::Aggregate', '0.364')) {
@@ -70,12 +73,12 @@ if ($ENV{AGGREGATE_TESTS} && can_use('Test::Simple', '0.88') && can_use('Test::A
 }
 else {
     unlink '.aggregating';
-    tests join q{ },
-        grep { $_ ne 't/aggregate.t' }
-        map  { glob } qw[t/*.t t/aggregate/*.t];
+    tests 't/*.t t/aggregate/*.t';
 }
+
 author_requires 'CatalystX::LeakChecker', '0.05';
 author_requires 'File::Copy::Recursive'; # For http server test
+author_requires 'Catalyst::Devel', '1.0'; # For http server test
 
 author_tests 't/author';
 author_requires(map {; $_ => 0 } qw(