X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=t%2Foptional_apache-cgi-rewrite.pl;h=ebfe69c91e550cfc011a21d9d6fa4a0102d83e0e;hp=7a6cbf15b666ff5d1ee514c79f914964501090fb;hb=fa2d8e3857cd3960f868d393e913377bd13f57a2;hpb=130ebb114034ef8895f0e0f62caa47c0d2b62d16

diff --git a/t/optional_apache-cgi-rewrite.pl b/t/optional_apache-cgi-rewrite.pl
old mode 100755
new mode 100644
index 7a6cbf1..ebfe69c
--- a/t/optional_apache-cgi-rewrite.pl
+++ b/t/optional_apache-cgi-rewrite.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,21 +16,19 @@ 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/rewrite';
 
+if ( !-e 't/optional_apache-cgi-rewrite.pl' ) {
+    die "ERROR: Please run test from the Catalyst-Runtime directory\n";
+}
+
+push @ARGV, glob( 't/aggregate/live_*' );
+
 Apache::TestRun->new->run(@ARGV);
 
 # clean up if the server has shut down