-#!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
# httpd.conf:
#
-# perl t/optional/apache-cgi.pl -httpd_conf /etc/apache/httpd.conf
+# perl t/optional_apache-cgi.pl -httpd_conf /etc/apache/httpd.conf
use strict;
use warnings;
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