svn commit: r1832508 - /httpd/test/framework/trunk/t/modules/proxy.t

[yl...@apache.org]

Author: ylavic
Date: Tue May 29 23:07:55 2018
New Revision: 1832508

URL: http://svn.apache.org/viewvc?rev=1832508&view=rev
Log:
Use skip to bypass conditional tests.

Modified:
    httpd/test/framework/trunk/t/modules/proxy.t

Modified: httpd/test/framework/trunk/t/modules/proxy.t
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/modules/proxy.t?rev=1832508&r1=1832507&r2=1832508&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/modules/proxy.t (original)
+++ httpd/test/framework/trunk/t/modules/proxy.t Tue May 29 23:07:55 2018
@@ -7,13 +7,7 @@ use Apache::TestUtil;
 use Apache::TestConfig ();
 use Misc;
 
-my $num_tests = 23;
-if (have_min_apache_version('2.4.7')) {
-    $num_tests += 2;
-}
-if (have_min_apache_version('2.5') && have_module('lua')) {
-    $num_tests += 6;
-}
+my $num_tests = 31;
 plan tests => $num_tests, need need_module 'proxy', need_module 'setenvif';
 
 Apache::TestRequest::module("proxy_http_reverse");
@@ -117,6 +111,9 @@ if (have_min_apache_version('2.5') && ha
     ok t_cmp($r->code, 200, "Lua executed");
     ok t_cmp($r->header("Set-Cookie"), "domain=remote;path=/remote;foo=bar", "'Set-Cookie path=' wrongly updated by ProxyPassReverseCookiePath and/or ProxyPassReverseCookieDomain");
 }
+else {
+    skip "skipping tests which need mod_lua" foreach (1..6);
+}
 
 if (have_module('alias')) {
     $r = GET("/reverse/perm");
@@ -183,4 +180,7 @@ if (have_min_apache_version('2.4.7')) {
     ok t_cmp($c, "hello world", "UDS content OK");
 
 }
+else {
+    skip "skipping UDS tests with httpd < 2.4.7" foreach (1..2);
+}