commit 5492b99da0e2e96389c5413b24aa68263acf7d5c
author Joe Orton <jorton@apache.org> Wed Jul 15 11:19:43 2020 +0000
committer Joe Orton <jorton@apache.org> Wed Jul 15 11:19:43 2020 +0000
tree d2f87c36c913a7d11a08a85a1ffa13e2e7d01b43
parent 08823c418702fe3740351b21f796fec7abe5aee3

With --enable-cgid-fdpassing, mod_cgid behaves (correctly) like mod_cgi
in logging script stderr to the ScriptLog, so unconditionally use a larger 
ScriptLogLength for testing both modules.


git-svn-id: https://svn.apache.org/repos/asf/httpd/test/framework/trunk@1879883 13f79535-47bb-0310-9956-ffa450edef68

t/conf/extra.conf.in

diff --git a/t/conf/extra.conf.in b/t/conf/extra.conf.in
index 657d470..cdde5db 100644
--- a/t/conf/extra.conf.in
+++ b/t/conf/extra.conf.in
@@ -340,12 +340,7 @@
     AddHandler cgi-script .sh
     AddHandler cgi-script .pl
     ScriptLog @SERVERROOT@/logs/mod_cgi.log
-    <IfModule mod_cgi.c>
-        ScriptLogLength 40960
-    </IfModule>
-    <IfModule !mod_cgi.c>
-        ScriptLogLength 8192
-    </IfModule>
+    ScriptLogLength 40960
     ScriptLogBuffer 256
 
     <Directory @SERVERROOT@/htdocs/modules/cgi>

t/modules/cgi.t

diff --git a/t/modules/cgi.t b/t/modules/cgi.t
index d191d8d..9b6edc2 100644
--- a/t/modules/cgi.t
+++ b/t/modules/cgi.t
@@ -9,10 +9,7 @@
 my $have_apache_2 = have_apache 2;
 my $have_apache_2050 = have_min_apache_version "2.0.50";
 
-my $script_log_length = 8192;
-if (have_module 'mod_cgi') {
-    $script_log_length = 40960;
-}
+my $script_log_length = 40960;
 
 ## mod_cgi test
 ##
@@ -21,12 +18,7 @@
 ## AddHandler cgi-script .sh
 ## AddHandler cgi-script .pl
 ## ScriptLog logs/mod_cgi.log
-## <IfModule mod_cgi.c>
-##     ScriptLogLength 40960
-## </IfModule mod_cgi>
-## <IfModule !mod_cgi.c>
-##     ScriptLogLength 8192
-## </IfModule mod_cgi>
+## ScriptLogLength 40960
 ## ScriptLogBuffer 256
 ## <Directory @SERVERROOT@/htdocs/modules/cgi>
 ## Options +ExecCGI
@@ -191,9 +183,8 @@
     $actual = POST_RC "$path/bogus-perl.pl", content => "$content"x$length;
 
     print "# posted content (length $length) to bogus-perl.pl\n";
-    print "# got return code of: $actual, expecting: $expected\n";
     ## should get rc 500
-    ok ($actual eq $expected);
+    ok t_cmp($actual, $expected, "POST to $path/bogus-perl.pl [content: $content x $length]");
 
     if (-e $cgi_log) {
         ## cgi log should be bigger.
@@ -206,7 +197,7 @@
             ## should not fall in here at this point,
             ## but just in case...
             print "# verifying log did not increase in size...\n";
-            ok ($$stat[7] eq $log_size);
+            ok t_cmp($$stat[7], $log_size, "log size should not have increased");
         }
         $log_size = $$stat[7];