httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yla...@apache.org
Subject svn commit: r1689845 - /httpd/test/framework/trunk/t/modules/proxy.t
Date Wed, 08 Jul 2015 11:28:59 GMT
Author: ylavic
Date: Wed Jul  8 11:28:59 2015
New Revision: 1689845

URL: http://svn.apache.org/r1689845
Log:
Don't test for ProxyPass to UDS below httpd-2.4.7 (fails on 2.2.x).

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=1689845&r1=1689844&r2=1689845&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/modules/proxy.t (original)
+++ httpd/test/framework/trunk/t/modules/proxy.t Wed Jul  8 11:28:59 2015
@@ -6,7 +6,11 @@ use Apache::TestRequest;
 use Apache::TestUtil;
 use Apache::TestConfig ();
 
-plan tests => 18, need_module 'proxy';
+my $num_tests = 17;
+if (have_min_apache_version('2.4.7')) {
+    $num_tests++;
+}
+plan tests => $num_tests, need_module 'proxy';
 
 Apache::TestRequest::module("proxy_http_reverse");
 Apache::TestRequest::user_agent(requests_redirectable => 0);
@@ -82,13 +86,15 @@ if (have_module('alias')) {
     skip "skipping tests without mod_alias" foreach (1..4);
 }
 
-my $pid = fork;
-if ($pid) {
-    system './scripts/uds-test.pl';
-    exit;
+if (have_min_apache_version('2.4.7')) {
+    my $pid = fork;
+    if ($pid) {
+        system './scripts/uds-test.pl';
+        exit;
+    }
+    # give time for the system call to take effect
+    sleep 2;
+    $r = GET("/uds/");
+    ok t_cmp($r->code, 200, "ProxyPass UDS path");
 }
-# give time for the system call to take effect
-sleep 2;
-$r = GET("/uds/");
-ok t_cmp($r->code, 200, "ProxyPass UDS path");
 



Mime
View raw message