svn commit: r1652559 - in /httpd/test/framework/trunk/t: conf/extra.conf.in modules/cgi.t

[rj...@apache.org]

Author: rjung
Date: Sat Jan 17 02:58:24 2015
New Revision: 1652559

URL: http://svn.apache.org/r1652559
Log:
Fix failing test.

After r1651085 for mod_cgi we log cgi script
stderr to ScriptLog. Two of our test scripts
write 8KB to STDERR, each is called two times.

So increase ScriptLogLength by 4 x 8KB, otherwise
the log file contents looked after by later tests
can not be found.

Modified:
    httpd/test/framework/trunk/t/conf/extra.conf.in
    httpd/test/framework/trunk/t/modules/cgi.t

Modified: httpd/test/framework/trunk/t/conf/extra.conf.in
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/conf/extra.conf.in?rev=1652559&r1=1652558&r2=1652559&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/conf/extra.conf.in (original)
+++ httpd/test/framework/trunk/t/conf/extra.conf.in Sat Jan 17 02:58:24 2015
@@ -289,7 +289,7 @@
     AddHandler cgi-script .sh
     AddHandler cgi-script .pl
     ScriptLog @SERVERROOT@/logs/mod_cgi.log
-    ScriptLogLength 8192
+    ScriptLogLength 40960
     ScriptLogBuffer 256
 
     <Directory @SERVERROOT@/htdocs/modules/cgi>

Modified: httpd/test/framework/trunk/t/modules/cgi.t
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/modules/cgi.t?rev=1652559&r1=1652558&r2=1652559&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/modules/cgi.t (original)
+++ httpd/test/framework/trunk/t/modules/cgi.t Sat Jan 17 02:58:24 2015
@@ -16,7 +16,7 @@ my $have_apache_2050 = have_min_apache_v
 ## AddHandler cgi-script .sh
 ## AddHandler cgi-script .pl
 ## ScriptLog logs/mod_cgi.log
-## ScriptLogLength 8192
+## ScriptLogLength 40960
 ## ScriptLogBuffer 256
 ## <Directory @SERVERROOT@/htdocs/modules/cgi>
 ## Options +ExecCGI
@@ -187,9 +187,9 @@ foreach my $length (@post_content) {
 
     if (-e $cgi_log) {
         ## cgi log should be bigger.
-        ## as long as it's under ScriptLogLength (8192)
+        ## as long as it's under ScriptLogLength (40960)
         $stat = stat($cgi_log);
-        if ($log_size < 8192) {
+        if ($log_size < 40960) {
             print "# checking that log size ($$stat[7]) is greater than $log_size\n";
             ok ($$stat[7] > $log_size);
         } else {
@@ -230,7 +230,7 @@ foreach my $length (@post_content) {
 
 ## make sure cgi log does not 
 ## keep logging after it is bigger
-## than ScriptLogLength (8192)
+## than ScriptLogLength (40960)
 for (my $i=1 ; $i<=20 ; $i++) {
 
     ## get out if log does not exist ##
@@ -243,12 +243,12 @@ for (my $i=1 ; $i<=20 ; $i++) {
     ## when log goes over max size stop making requests
     $stat = stat($cgi_log);
     $log_size = $$stat[7];
-    last if ($log_size > 8192);
+    last if ($log_size > 40960);
 
 }
-## make sure its over (or equal) 8192
-print "# verifying log is greater than 8192 bytes.\n";
-ok ($log_size >= 8192);
+## make sure its over (or equal) 40960
+print "# verifying log is greater than 40960 bytes.\n";
+ok ($log_size >= 40960);
 
 ## make sure it does not grow now.
 GET_RC "$path/bogus1k.pl";
@@ -275,4 +275,4 @@ print "# checking that HEAD $path/perl.p
 ok HEAD_RC("$path/perl.pl") == 200;
 
 ## clean up
-unlink $cgi_log;
+#unlink $cgi_log;