You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by me...@apache.org on 2019/11/27 15:57:29 UTC
[incubator-apisix] branch master updated: Tengine: run test cases
with patch files (#834)
This is an automated email from the ASF dual-hosted git repository.
membphis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-apisix.git
The following commit(s) were added to refs/heads/master by this push:
new 2510241 Tengine: run test cases with patch files (#834)
2510241 is described below
commit 25102419d0487ee37d80db5e1b2a10a29843a75b
Author: wonglend <gk...@qq.com>
AuthorDate: Wed Nov 27 23:57:23 2019 +0800
Tengine: run test cases with patch files (#834)
* Patches the tengine 2.3.2 (which based on nginx-1.17.3) core using .patch files from openresty upstream:
```
patch -p1 < ../../patches/nginx-1.17.4-always_enable_cc_feature_tests.patch
patch -p1 < ../../patches/nginx-1.17.4-balancer_status_code.patch
patch -p1 < ../../patches/nginx-1.17.4-cache_manager_exit.patch
patch -p1 < ../../patches/nginx-1.17.4-daemon_destroy_pool.patch
patch -p1 < ../../patches/nginx-1.17.4-delayed_posted_events.patch
patch -p1 < ../../patches/nginx-1.17.4-gcc-maybe-uninitialized-warning.patch
patch -p1 < ../../patches/nginx-1.17.4-hash_overflow.patch
patch -p1 < ../../patches/nginx-1.17.4-init_cycle_pool_release.patch
patch -p1 < ../../patches/nginx-1.17.4-larger_max_error_str.patch
patch -p1 < ../../patches/nginx-1.17.4-log_escape_non_ascii.patch
patch -p1 < ../../patches/nginx-1.17.4-no_Werror.patch
patch -p1 < ../../patches/nginx-1.17.4-pcre_conf_opt.patch
patch -p1 < ../../patches/nginx-1.17.4-proxy_host_port_vars.patch
patch -p1 < ../../patches/nginx-1.17.4-resolver_conf_parsing.patch
patch -p1 < ../../patches/nginx-1.17.4-reuseport_close_unused_fds.patch
patch -p1 < ../../patches/nginx-1.17.4-safe_resolver_ipv6_option.patch
patch -p1 < ../../patches/nginx-1.17.4-single_process_graceful_exit.patch
patch -p1 < ../../patches/nginx-1.17.4-ssl_cert_cb_yield.patch
patch -p1 < ../../patches/nginx-1.17.4-ssl_sess_cb_yield.patch
patch -p1 < ../../patches/nginx-1.17.4-stream_balancer_export.patch
patch -p1 < ../../patches/nginx-1.17.4-stream_proxy_get_next_upstream_tries.patch
patch -p1 < ../../patches/nginx-1.17.4-stream_proxy_timeout_fields.patch
patch -p1 < ../../patches/nginx-1.17.4-stream_ssl_preread_no_skip.patch
patch -p1 < ../../patches/nginx-1.17.4-upstream_pipelining.patch
patch -p1 < ../../patches/nginx-1.17.4-upstream_timeout_fields.patch
```
---
.travis/linux_tengine_runner.sh | 59 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 59 insertions(+)
diff --git a/.travis/linux_tengine_runner.sh b/.travis/linux_tengine_runner.sh
index c7742bd..c175664 100755
--- a/.travis/linux_tengine_runner.sh
+++ b/.travis/linux_tengine_runner.sh
@@ -67,6 +67,65 @@ tengine_install() {
cd openresty-1.15.8.2
+ # patching start
+ # https://github.com/alibaba/tengine/issues/1381#issuecomment-541493008
+ # other patches for tengine 2.3.2 from upstream openresty
+ wget -P patches https://raw.githubusercontent.com/openresty/openresty/master/patches/nginx-1.17.4-always_enable_cc_feature_tests.patch
+ wget -P patches https://raw.githubusercontent.com/openresty/openresty/master/patches/nginx-1.17.4-balancer_status_code.patch
+ wget -P patches https://raw.githubusercontent.com/openresty/openresty/master/patches/nginx-1.17.4-cache_manager_exit.patch
+ wget -P patches https://raw.githubusercontent.com/openresty/openresty/master/patches/nginx-1.17.4-daemon_destroy_pool.patch
+ wget -P patches https://raw.githubusercontent.com/openresty/openresty/master/patches/nginx-1.17.4-delayed_posted_events.patch
+ wget -P patches https://raw.githubusercontent.com/openresty/openresty/master/patches/nginx-1.17.4-gcc-maybe-uninitialized-warning.patch
+ wget -P patches https://raw.githubusercontent.com/openresty/openresty/master/patches/nginx-1.17.4-hash_overflow.patch
+ wget -P patches https://raw.githubusercontent.com/openresty/openresty/master/patches/nginx-1.17.4-init_cycle_pool_release.patch
+ wget -P patches https://raw.githubusercontent.com/openresty/openresty/master/patches/nginx-1.17.4-larger_max_error_str.patch
+ wget -P patches https://raw.githubusercontent.com/openresty/openresty/master/patches/nginx-1.17.4-log_escape_non_ascii.patch
+ wget -P patches https://raw.githubusercontent.com/openresty/openresty/master/patches/nginx-1.17.4-no_Werror.patch
+ wget -P patches https://raw.githubusercontent.com/openresty/openresty/master/patches/nginx-1.17.4-pcre_conf_opt.patch
+ wget -P patches https://raw.githubusercontent.com/openresty/openresty/master/patches/nginx-1.17.4-proxy_host_port_vars.patch
+ wget -P patches https://raw.githubusercontent.com/openresty/openresty/master/patches/nginx-1.17.4-resolver_conf_parsing.patch
+ wget -P patches https://raw.githubusercontent.com/openresty/openresty/master/patches/nginx-1.17.4-reuseport_close_unused_fds.patch
+ wget -P patches https://raw.githubusercontent.com/openresty/openresty/master/patches/nginx-1.17.4-safe_resolver_ipv6_option.patch
+ wget -P patches https://raw.githubusercontent.com/openresty/openresty/master/patches/nginx-1.17.4-single_process_graceful_exit.patch
+ wget -P patches https://raw.githubusercontent.com/openresty/openresty/master/patches/nginx-1.17.4-ssl_cert_cb_yield.patch
+ wget -P patches https://raw.githubusercontent.com/openresty/openresty/master/patches/nginx-1.17.4-ssl_sess_cb_yield.patch
+ wget -P patches https://raw.githubusercontent.com/openresty/openresty/master/patches/nginx-1.17.4-stream_balancer_export.patch
+ wget -P patches https://raw.githubusercontent.com/openresty/openresty/master/patches/nginx-1.17.4-stream_proxy_get_next_upstream_tries.patch
+ wget -P patches https://raw.githubusercontent.com/openresty/openresty/master/patches/nginx-1.17.4-stream_proxy_timeout_fields.patch
+ wget -P patches https://raw.githubusercontent.com/openresty/openresty/master/patches/nginx-1.17.4-stream_ssl_preread_no_skip.patch
+ wget -P patches https://raw.githubusercontent.com/openresty/openresty/master/patches/nginx-1.17.4-upstream_pipelining.patch
+ wget -P patches https://raw.githubusercontent.com/openresty/openresty/master/patches/nginx-1.17.4-upstream_timeout_fields.patch
+
+ cd bundle/tengine-2.3.2
+ patch -p1 < ../../patches/nginx-1.17.4-always_enable_cc_feature_tests.patch
+ patch -p1 < ../../patches/nginx-1.17.4-balancer_status_code.patch
+ patch -p1 < ../../patches/nginx-1.17.4-cache_manager_exit.patch
+ patch -p1 < ../../patches/nginx-1.17.4-daemon_destroy_pool.patch
+ patch -p1 < ../../patches/nginx-1.17.4-delayed_posted_events.patch
+ patch -p1 < ../../patches/nginx-1.17.4-gcc-maybe-uninitialized-warning.patch
+ patch -p1 < ../../patches/nginx-1.17.4-hash_overflow.patch
+ patch -p1 < ../../patches/nginx-1.17.4-init_cycle_pool_release.patch
+ patch -p1 < ../../patches/nginx-1.17.4-larger_max_error_str.patch
+ patch -p1 < ../../patches/nginx-1.17.4-log_escape_non_ascii.patch
+ patch -p1 < ../../patches/nginx-1.17.4-no_Werror.patch
+ patch -p1 < ../../patches/nginx-1.17.4-pcre_conf_opt.patch
+ patch -p1 < ../../patches/nginx-1.17.4-proxy_host_port_vars.patch
+ patch -p1 < ../../patches/nginx-1.17.4-resolver_conf_parsing.patch
+ patch -p1 < ../../patches/nginx-1.17.4-reuseport_close_unused_fds.patch
+ patch -p1 < ../../patches/nginx-1.17.4-safe_resolver_ipv6_option.patch
+ patch -p1 < ../../patches/nginx-1.17.4-single_process_graceful_exit.patch
+ patch -p1 < ../../patches/nginx-1.17.4-ssl_cert_cb_yield.patch
+ patch -p1 < ../../patches/nginx-1.17.4-ssl_sess_cb_yield.patch
+ patch -p1 < ../../patches/nginx-1.17.4-stream_balancer_export.patch
+ patch -p1 < ../../patches/nginx-1.17.4-stream_proxy_get_next_upstream_tries.patch
+ patch -p1 < ../../patches/nginx-1.17.4-stream_proxy_timeout_fields.patch
+ patch -p1 < ../../patches/nginx-1.17.4-stream_ssl_preread_no_skip.patch
+ patch -p1 < ../../patches/nginx-1.17.4-upstream_pipelining.patch
+ patch -p1 < ../../patches/nginx-1.17.4-upstream_timeout_fields.patch
+
+ cd -
+ # patching end
+
./configure --prefix=${OPENRESTY_PREFIX} --with-debug \
--with-compat \
--with-file-aio \