X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=t%2Foptional_apache-cgi.pl;h=09363a6261e13c5e5284aab3d298ad8ac8bce042;hp=160ec7ae233cf454217a3a6f973c707a02d1f761;hb=8ae46e9876d7f0285d7a71eb3669a593a26ef4bb;hpb=498a0db3d2c6de86ea2185be6620625785e14196

diff --git a/t/optional_apache-cgi.pl b/t/optional_apache-cgi.pl
old mode 100755
new mode 100644
index 160ec7a..09363a6
--- a/t/optional_apache-cgi.pl
+++ b/t/optional_apache-cgi.pl
@@ -1,5 +1,3 @@
-#!perl
-
 # Run all tests against CGI mode under Apache
 #
 # Note, to get this to run properly, you may need to give it the path to your
@@ -18,18 +16,10 @@ use File::Copy::Recursive;
 use FindBin;
 use IO::Socket;
 
-# clean up
-rmtree "$FindBin::Bin/../t/tmp" if -d "$FindBin::Bin/../t/tmp";
-
-# 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' );
+use lib 't/lib';
+use MakeTestApp;
 
-# remove TestApp's tests so Apache::Test doesn't try to run them
-rmtree 't/tmp/TestApp/t';
+make_test_app;
 
 $ENV{CATALYST_SERVER} = 'http://localhost:8529/cgi';
 
@@ -37,7 +27,7 @@ if ( !-e 't/optional_apache-cgi.pl' ) {
     die "ERROR: Please run test from the Catalyst-Runtime directory\n";
 }
 
-push @ARGV, glob( 't/live_*' );
+push @ARGV, glob( 't/aggregate/live_*' );
 
 Apache::TestRun->new->run(@ARGV);