X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=t%2Foptional_apache-fastcgi.pl;h=adc68eac2e172103a8b01cc3f9ce1f386542ec35;hp=759febd8af91501e141d8f9653d74f7ba21b478e;hb=8ae46e9876d7f0285d7a71eb3669a593a26ef4bb;hpb=47c97b64103173bede56e5c773a2e9c3ae028851

diff --git a/t/optional_apache-fastcgi.pl b/t/optional_apache-fastcgi.pl
old mode 100755
new mode 100644
index 759febd..adc68ea
--- a/t/optional_apache-fastcgi.pl
+++ b/t/optional_apache-fastcgi.pl
@@ -1,11 +1,9 @@
-#!perl
-
 # Run all tests against FastCGI mode under Apache
 #
 # Note, to get this to run properly, you may need to give it the path to your
 # httpd.conf:
 #
-# perl t/optional/apache-fastcgi.pl -httpd_conf /etc/apache/httpd.conf
+# perl t/optional_apache-fastcgi.pl -httpd_conf /etc/apache/httpd.conf
 
 use strict;
 use warnings;
@@ -18,20 +16,18 @@ use File::Copy::Recursive;
 use FindBin;
 use IO::Socket;
 
-# clean up
-rmtree "$FindBin::Bin/../t/tmp" if -d "$FindBin::Bin/../t/tmp";
+use lib 't/lib';
+use MakeTestApp;
+
+make_test_app;
 
-# create a TestApp and copy the test libs into it
-mkdir "$FindBin::Bin/../t/tmp";
-chdir "$FindBin::Bin/../t/tmp";
-system "$FindBin::Bin/../script/catalyst.pl TestApp";
-chdir "$FindBin::Bin/..";
-File::Copy::Recursive::dircopy( 't/lib', 't/tmp/TestApp/lib' );
+$ENV{CATALYST_SERVER} = 'http://localhost:8529';
 
-# remove TestApp's tests so Apache::Test doesn't try to run them
-rmtree 't/tmp/TestApp/t';
+if ( !-e 't/optional_apache-fastcgi.pl' ) {
+    die "ERROR: Please run test from the Catalyst-Runtime directory\n";
+}
 
-$ENV{CATALYST_SERVER} = 'http://localhost:8529/fastcgi';
+push @ARGV, glob( 't/aggregate/live_*' );
 
 Apache::TestRun->new->run(@ARGV);