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 2018/10/19 13:09:47 UTC
svn commit: r1844339 - in /httpd/test/mod_h2/trunk: Makefile.am bin/
bin/Makefile.am conf/ conf/Makefile.am configure.ac htdocs/
htdocs/Makefile.am nghttp2/Makefile.am test/ test/Makefile.am
test/go/test_get.sh
Author: icing
Date: Fri Oct 19 13:09:47 2018
New Revision: 1844339
URL: http://svn.apache.org/viewvc?rev=1844339&view=rev
Log:
Removing tests for specific ssl protocol as too dependant on system ssl vs. local ssl vs. propxy connections.
Make distclean work.
Added:
httpd/test/mod_h2/trunk/bin/Makefile.am
httpd/test/mod_h2/trunk/conf/Makefile.am
httpd/test/mod_h2/trunk/htdocs/Makefile.am
httpd/test/mod_h2/trunk/test/Makefile.am
Modified:
httpd/test/mod_h2/trunk/Makefile.am
httpd/test/mod_h2/trunk/bin/ (props changed)
httpd/test/mod_h2/trunk/conf/ (props changed)
httpd/test/mod_h2/trunk/configure.ac
httpd/test/mod_h2/trunk/htdocs/ (props changed)
httpd/test/mod_h2/trunk/nghttp2/Makefile.am
httpd/test/mod_h2/trunk/test/ (props changed)
httpd/test/mod_h2/trunk/test/go/test_get.sh
Modified: httpd/test/mod_h2/trunk/Makefile.am
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/Makefile.am?rev=1844339&r1=1844338&r2=1844339&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/Makefile.am (original)
+++ httpd/test/mod_h2/trunk/Makefile.am Fri Oct 19 13:09:47 2018
@@ -96,6 +96,9 @@ reload: $(SERVER_DIR)/.test-setup
stop:
$(APACHECTL) -k stop
+install-openssl:
+ @make -C nghttp2 install-openssl
+
install-nghttp2:
@make -C nghttp2 install
Propchange: httpd/test/mod_h2/trunk/bin/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Oct 19 13:09:47 2018
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
Added: httpd/test/mod_h2/trunk/bin/Makefile.am
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/bin/Makefile.am?rev=1844339&view=auto
==============================================================================
(empty)
Propchange: httpd/test/mod_h2/trunk/conf/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Oct 19 13:09:47 2018
@@ -0,0 +1,2 @@
+Makefile.in
+Makefile
Added: httpd/test/mod_h2/trunk/conf/Makefile.am
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/conf/Makefile.am?rev=1844339&view=auto
==============================================================================
(empty)
Modified: httpd/test/mod_h2/trunk/configure.ac
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/configure.ac?rev=1844339&r1=1844338&r2=1844339&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/configure.ac (original)
+++ httpd/test/mod_h2/trunk/configure.ac Fri Oct 19 13:09:47 2018
@@ -319,6 +319,7 @@ case "$OPENSSL_VERSION_PRESENT" in
;;
*)
NGHTTP2_DEPS="$NGHTTP2_DEPS gen/.openssl-installed"
+ INSTALL_DEP="install-openssl ${INSTALL_DEP}"
INSTALL_ADDITIONAL="$INSTALL_ADDITIONAL openssl($OPENSSL_VERSION)"
CURL_CONF="$CURL_CONF "'--with-nghttp2=$(prefix) --with-ssl=$(prefix)'
if test "$OS" = "Darwin"; then
@@ -420,6 +421,10 @@ AC_CONFIG_FILES([
clients/Makefile
mh2fuzz/Makefile
mh2fuzz/mh2f_version.h
+ test/Makefile
+ bin/Makefile
+ conf/Makefile
+ htdocs/Makefile
])
AC_OUTPUT
Propchange: httpd/test/mod_h2/trunk/htdocs/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Oct 19 13:09:47 2018
@@ -0,0 +1,2 @@
+Makefile.in
+Makefile
Added: httpd/test/mod_h2/trunk/htdocs/Makefile.am
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/htdocs/Makefile.am?rev=1844339&view=auto
==============================================================================
(empty)
Modified: httpd/test/mod_h2/trunk/nghttp2/Makefile.am
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/nghttp2/Makefile.am?rev=1844339&r1=1844338&r2=1844339&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/nghttp2/Makefile.am (original)
+++ httpd/test/mod_h2/trunk/nghttp2/Makefile.am Fri Oct 19 13:09:47 2018
@@ -87,8 +87,11 @@ distdir:
@mkdir -p $(distdir)
@tar cf - Makefile patches | (cd $(distdir) && tar xf - )
-install: $(GEN)/.nghttp2-installed
+install: $(GEN)/.nghttp2-installed \
+ $(NGHTTP2_DEPS)
+install-openssl: \
+ $(GEN)/.nghttp2-installed
################################################################################
# Install the local nghttp2
Propchange: httpd/test/mod_h2/trunk/test/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Oct 19 13:09:47 2018
@@ -0,0 +1,2 @@
+Makefile.in
+Makefile
Added: httpd/test/mod_h2/trunk/test/Makefile.am
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/test/Makefile.am?rev=1844339&view=auto
==============================================================================
(empty)
Modified: httpd/test/mod_h2/trunk/test/go/test_get.sh
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/test/go/test_get.sh?rev=1844339&r1=1844338&r2=1844339&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/go/test_get.sh (original)
+++ httpd/test/mod_h2/trunk/test/go/test_get.sh Fri Oct 19 13:09:47 2018
@@ -59,7 +59,6 @@ go_check_content hello.py "http/1.1" --h
<h2>Hello World!</h2>
HTTPS=${EXP_HTTPS}<br/>
PROTOCOL=${EXP_H1_PROTOCOL}<br/>
-SSL_PROTOCOL=${EXP_GO_SSL_PROTOCOL}<br/>
HTTP2=${EXP_H1_HTTP2}<br/>
H2PUSH=${EXP_H1_H2PUSH}<br/>
</body>
@@ -73,7 +72,6 @@ go_check_content hello.py "http2" <<EOF
<h2>Hello World!</h2>
HTTPS=${EXP_HTTPS}<br/>
PROTOCOL=${EXP_PROTOCOL}<br/>
-SSL_PROTOCOL=${EXP_GO_SSL_PROTOCOL}<br/>
HTTP2=${EXP_HTTP2}<br/>
H2PUSH=off<br/>
</body>