You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ic...@apache.org on 2017/03/31 14:05:36 UTC
svn commit: r1789688 - in /httpd/test/mod_h2/trunk: Makefile.am
conf/httpd.conf test/test.sh
Author: icing
Date: Fri Mar 31 14:05:36 2017
New Revision: 1789688
URL: http://svn.apache.org/viewvc?rev=1789688&view=rev
Log:
conf using default H2Worker values, h2load added tests with more connections
Modified:
httpd/test/mod_h2/trunk/Makefile.am
httpd/test/mod_h2/trunk/conf/httpd.conf
httpd/test/mod_h2/trunk/test/test.sh
Modified: httpd/test/mod_h2/trunk/Makefile.am
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/Makefile.am?rev=1789688&r1=1789687&r2=1789688&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/Makefile.am (original)
+++ httpd/test/mod_h2/trunk/Makefile.am Fri Mar 31 14:05:36 2017
@@ -198,6 +198,8 @@ h2load: \
$(H2LOAD) -i $(GEN)/load-urls-1.txt -n 200000 -t 4 -m $(MAX_STREAMS) -c 8
$(H2LOAD) -i $(GEN)/load-urls-1.txt -n 200000 -t 4 -m $(MAX_STREAMS) -c 16
$(H2LOAD) -i $(GEN)/load-urls-1.txt -n 200000 -t 4 -m $(MAX_STREAMS) -c 32
+ $(H2LOAD) -i $(GEN)/load-urls-1.txt -n 200000 -t 4 -m $(MAX_STREAMS) -c 64
+ $(H2LOAD) -i $(GEN)/load-urls-1.txt -n 200000 -t 4 -m $(MAX_STREAMS) -c 128
$(H2LOAD) -t 8 -c 100 -n 10000 -m 5 -d $(GEN)/data-10k http://$(HTTP_AUTH)/
$(H2LOAD) -t 8 -c 100 -n 10000 -m 5 -d $(GEN)/data-1m http://$(HTTP_AUTH)/
@@ -211,6 +213,8 @@ h2cload: \
$(H2LOAD) -i $(GEN)/load-h2c-urls-1.txt -n 200000 -t 4 -m $(MAX_STREAMS) -c 8
$(H2LOAD) -i $(GEN)/load-h2c-urls-1.txt -n 200000 -t 4 -m $(MAX_STREAMS) -c 16
$(H2LOAD) -i $(GEN)/load-h2c-urls-1.txt -n 200000 -t 4 -m $(MAX_STREAMS) -c 32
+ $(H2LOAD) -i $(GEN)/load-h2c-urls-1.txt -n 200000 -t 4 -m $(MAX_STREAMS) -c 64
+ $(H2LOAD) -i $(GEN)/load-h2c-urls-1.txt -n 200000 -t 4 -m $(MAX_STREAMS) -c 128
proxyload: \
$(SERVER_DIR)/.test-setup \
Modified: httpd/test/mod_h2/trunk/conf/httpd.conf
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/conf/httpd.conf?rev=1789688&r1=1789687&r2=1789688&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/conf/httpd.conf (original)
+++ httpd/test/mod_h2/trunk/conf/httpd.conf Fri Mar 31 14:05:36 2017
@@ -110,8 +110,8 @@ DocumentRoot "SUBST_SERVER_ROOT_SUBST/ht
# you may set these explicitly, otherwise they are taking from
# ThreadsPerChild and HardLimitThreads parameters of the mpm module
#
- H2MinWorkers 12
- H2MaxWorkers 24
+ #H2MinWorkers 12
+ #H2MaxWorkers 50
# seconds a worker stays idle until shut down, default 10 minutes, let's
# have it quicker for out tests
H2MaxWorkerIdleSeconds 10
Modified: httpd/test/mod_h2/trunk/test/test.sh
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/test/test.sh?rev=1789688&r1=1789687&r2=1789688&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test.sh (original)
+++ httpd/test/mod_h2/trunk/test/test.sh Fri Mar 31 14:05:36 2017
@@ -60,13 +60,13 @@ $SHELL "$TEST_DIR"/test_push.sh $
$SHELL "$TEST_DIR"/test_interim.sh $HTTPS_AUTH &&
$SHELL "$TEST_DIR"/test_interim.sh $HTTPS_AUTH/proxy &&
$SHELL "$TEST_DIR"/test_interim.sh $HTTPS_AUTH/rewrite &&
-$SHELL "$TEST_DIR"/test_interim.sh $HTTPS_AUTH_SER &&
+$SHELL "$TEST_DIR"/test_interim.sh $HTTPS_AUTH_SER || fail
$SHELL "$TEST_DIR"/test_shutdown.sh $HTTPS_AUTH || fail
-$SHELL "$TEST_DIR"/test_nghttp_get.sh $HTTPS_AUTH &&
-$SHELL "$TEST_DIR"/test_nghttp_post.sh $HTTPS_AUTH &&
$SHELL "$TEST_DIR"/test_curl_get.sh $HTTPS_AUTH &&
-$SHELL "$TEST_DIR"/test_curl_post.sh $HTTPS_AUTH ||fail
+$SHELL "$TEST_DIR"/test_curl_post.sh $HTTPS_AUTH &&
+$SHELL "$TEST_DIR"/test_nghttp_get.sh $HTTPS_AUTH &&
+$SHELL "$TEST_DIR"/test_nghttp_post.sh $HTTPS_AUTH || fail
$SHELL "$TEST_DIR"/test_conditionals.sh $HTTPS_AUTH &&
$SHELL "$TEST_DIR"/test_conditionals.sh $HTTPS_AUTH_2 &&