httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ic...@apache.org
Subject svn commit: r1710206 - in /httpd/test/mod_h2/trunk: Makefile.am conf/httpd.conf
Date Fri, 23 Oct 2015 13:33:39 GMT
Author: icing
Date: Fri Oct 23 13:33:39 2015
New Revision: 1710206

URL: http://svn.apache.org/viewvc?rev=1710206&view=rev
Log:
2.4 test suite, earlier worker idle abort

Modified:
    httpd/test/mod_h2/trunk/Makefile.am
    httpd/test/mod_h2/trunk/conf/httpd.conf

Modified: httpd/test/mod_h2/trunk/Makefile.am
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/Makefile.am?rev=1710206&r1=1710205&r2=1710206&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/Makefile.am (original)
+++ httpd/test/mod_h2/trunk/Makefile.am Fri Oct 23 13:33:39 2015
@@ -149,6 +149,44 @@ test: \
 	@$(TESTRUN) test/test_curl_get.sh    https://$(HTTPS_AUTH_SER) alpn "HTTP/1.1"
 	@$(TESTRUN) test/test_curl_post.sh   https://$(HTTPS_AUTH_SER) alpn "HTTP/1.1"
 
+test2.4: \
+		$(SERVER_DIR)/.test-setup \
+		$(SERVER_DIR)/.curl-installed
+	@rm -rf $(GEN)/tmp
+	@mkdir -p $(GEN)/tmp
+	@$(TESTRUN) test/test_curl_altsvc.sh http://$(HTTP_AUTH) https://$(HTTPS_AUTH)
+	@$(TESTRUN) test/test_proto_order.sh https://$(HTTPS_AUTH) https://$(HTTPS_AUTH_2)
+	@$(TESTRUN) test/test_nghttp_get.sh  https://$(HTTPS_AUTH)
+	@$(TESTRUN) test/test_nghttp_post.sh https://$(HTTPS_AUTH)
+	@$(TESTRUN) test/test_curl_get.sh    https://$(HTTPS_AUTH)
+	@$(TESTRUN) test/test_curl_post.sh   https://$(HTTPS_AUTH)
+	@$(TESTRUN) test/test_nghttp_get.sh  https://$(HTTPS_AUTH)/proxy alpn "HTTP/1.1"
+	@$(TESTRUN) test/test_nghttp_post.sh https://$(HTTPS_AUTH)/proxy alpn "HTTP/1.1"
+	@$(TESTRUN) test/test_curl_get.sh    https://$(HTTPS_AUTH)/proxy alpn "HTTP/1.1"
+	@$(TESTRUN) test/test_curl_post.sh   https://$(HTTPS_AUTH)/proxy alpn "HTTP/1.1"
+	@$(TESTRUN) test/test_nghttp_get.sh  https://$(HTTPS_AUTH)/rewrite alpn "HTTP/1.1"
+	@$(TESTRUN) test/test_nghttp_post.sh https://$(HTTPS_AUTH)/rewrite alpn "HTTP/1.1"
+	@$(TESTRUN) test/test_curl_get.sh    https://$(HTTPS_AUTH)/rewrite alpn "HTTP/1.1"
+	@$(TESTRUN) test/test_curl_post.sh   https://$(HTTPS_AUTH)/rewrite alpn "HTTP/1.1"
+	@$(TESTRUN) test/test_nghttp_get.sh  http://$(HTTP_AUTH)
+	@$(TESTRUN) test/test_nghttp_post.sh http://$(HTTP_AUTH)
+	@$(TESTRUN) test/test_curl_get.sh    http://$(HTTP_AUTH)
+	@$(TESTRUN) test/test_curl_post.sh   http://$(HTTP_AUTH)
+	@$(TESTRUN) test/test_nghttp_get.sh  http://$(HTTP_AUTH) direct
+	@$(TESTRUN) test/test_nghttp_post.sh http://$(HTTP_AUTH) direct
+	@$(TESTRUN) test/test_nghttp_get.sh  http://$(HTTP_AUTH)/proxy alpn "HTTP/1.1"
+	@$(TESTRUN) test/test_nghttp_post.sh http://$(HTTP_AUTH)/proxy alpn "HTTP/1.1"
+	@$(TESTRUN) test/test_curl_get.sh    http://$(HTTP_AUTH)/proxy alpn "HTTP/1.1"
+	@$(TESTRUN) test/test_curl_post.sh   http://$(HTTP_AUTH)/proxy alpn "HTTP/1.1"
+	@$(TESTRUN) test/test_nghttp_get.sh  http://$(HTTP_AUTH)/rewrite alpn "HTTP/1.1"
+	@$(TESTRUN) test/test_nghttp_post.sh http://$(HTTP_AUTH)/rewrite alpn "HTTP/1.1"
+	@$(TESTRUN) test/test_curl_get.sh    http://$(HTTP_AUTH)/rewrite alpn "HTTP/1.1"
+	@$(TESTRUN) test/test_curl_post.sh   http://$(HTTP_AUTH)/rewrite alpn "HTTP/1.1"
+	@$(TESTRUN) test/test_nghttp_get.sh  https://$(HTTPS_AUTH_SER) alpn "HTTP/1.1"
+	@$(TESTRUN) test/test_nghttp_post.sh https://$(HTTPS_AUTH_SER) alpn "HTTP/1.1"
+	@$(TESTRUN) test/test_curl_get.sh    https://$(HTTPS_AUTH_SER) alpn "HTTP/1.1"
+	@$(TESTRUN) test/test_curl_post.sh   https://$(HTTPS_AUTH_SER) alpn "HTTP/1.1"
+
 ################################################################################
 # Load Test
 #

Modified: httpd/test/mod_h2/trunk/conf/httpd.conf
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/conf/httpd.conf?rev=1710206&r1=1710205&r2=1710206&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/conf/httpd.conf (original)
+++ httpd/test/mod_h2/trunk/conf/httpd.conf Fri Oct 23 13:33:39 2015
@@ -77,8 +77,9 @@ MaxKeepAliveRequests 0
     #
     #H2MinWorkers 8
     #H2MaxWorkers 128
-    # seconds a worker stays idle until shut down, default 10 minutes
-    #H2MaxWorkerIdleSeconds 600
+    # seconds a worker stays idle until shut down, default 10 minutes, let's
+    # have it quicker for out tests
+    H2MaxWorkerIdleSeconds 10
 
     # If stream processing should serialize/read HTTP/1.1 headers for 
     # better backward compatibility with eventually installed filters



Mime
View raw message