Fix optional tests to run the live tests in the aggregate dir

diff --git a/t/optional_apache-cgi-rewrite.pl b/t/optional_apache-cgi-rewrite.pl
index ce4d9c8..8ce1d6b 100755 (executable)
--- a/t/optional_apache-cgi-rewrite.pl
+++ b/t/optional_apache-cgi-rewrite.pl
@@ -37,7 +37,7 @@ if ( !-e 't/optional_apache-cgi-rewrite.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);
 

diff --git a/t/optional_apache-cgi.pl b/t/optional_apache-cgi.pl
index 160ec7a..fd2d9a6 100755 (executable)
--- a/t/optional_apache-cgi.pl
+++ b/t/optional_apache-cgi.pl
@@ -37,7 +37,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);
 

diff --git a/t/optional_apache-fastcgi-non-root.pl b/t/optional_apache-fastcgi-non-root.pl
index 11eb8ca..23ea42d 100755 (executable)
--- a/t/optional_apache-fastcgi-non-root.pl
+++ b/t/optional_apache-fastcgi-non-root.pl
@@ -37,7 +37,7 @@ if ( !-e 't/optional_apache-fastcgi.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);
 

diff --git a/t/optional_apache-fastcgi.pl b/t/optional_apache-fastcgi.pl
index 9ad2ca6..715a623 100755 (executable)
--- a/t/optional_apache-fastcgi.pl
+++ b/t/optional_apache-fastcgi.pl
@@ -37,7 +37,7 @@ if ( !-e 't/optional_apache-fastcgi.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);
 

diff --git a/t/optional_http-server.t b/t/optional_http-server.t
index e4b3b83..4f006b2 100644 (file)
--- a/t/optional_http-server.t
+++ b/t/optional_http-server.t
@@ -53,7 +53,7 @@ if ( $single_test ) {
     $return = system( "$^X -Ilib/ $single_test" );
 }
 else {
-    $return = prove( '-r', '-Ilib/', glob('t/live_*.t') );
+    $return = prove( '-r', '-Ilib/', glob('t/aggregate/live_*.t') );
 }
 
 # shut it down

diff --git a/t/optional_lighttpd-fastcgi-non-root.t b/t/optional_lighttpd-fastcgi-non-root.t
index 6e1bb67..5f8ba1b 100644 (file)
--- a/t/optional_lighttpd-fastcgi-non-root.t
+++ b/t/optional_lighttpd-fastcgi-non-root.t
@@ -107,7 +107,7 @@ while ( check_port( 'localhost', $port ) != 1 ) {
 # run the testsuite against the server
 $ENV{CATALYST_SERVER} = "http://localhost:$port/deep/path";
 
-my @tests = (shift) || glob('t/live_*');
+my @tests = (shift) || glob('t/aggregate/live_*');
 eval {
     runtests(@tests);
 };

diff --git a/t/optional_lighttpd-fastcgi.t b/t/optional_lighttpd-fastcgi.t
index d5e42d4..c09e0ca 100644 (file)
--- a/t/optional_lighttpd-fastcgi.t
+++ b/t/optional_lighttpd-fastcgi.t
@@ -102,7 +102,7 @@ while ( check_port( 'localhost', $port ) != 1 ) {
 # run the testsuite against the server
 $ENV{CATALYST_SERVER} = "http://localhost:$port";
 
-my @tests = (shift) || glob('t/live_*');
+my @tests = (shift) || glob('t/aggregate/live_*');
 eval {
     runtests(@tests);
 };