From 8e9a33ec5d7dda40d6bedbc238715468d10eb0fb Mon Sep 17 00:00:00 2001
From: Xiaochen Wang <wangxiaochen0@gmail.com>
Date: Tue, 8 Aug 2023 14:06:46 +0800
Subject: [PATCH] ngx_debug_conn: fixed test case failure (#1848)

* ci.yml: added debug_conn/debug_timer/stat_slab test cases

* ngx_debug_conn: define ngx_pool_size macro

* ci-arm64.yml: enabled the ngx_debug_conn module for building

* ngx_debug_conn: fixed test case failure of not find resty.core library
---
 .github/workflows/ci-arm64.yml                      | 1 +
 .github/workflows/ci.yml                            | 4 ++++
 modules/ngx_debug_conn/ngx_http_debug_conn_module.c | 2 +-
 modules/ngx_debug_conn/t/test.t                     | 1 +
 modules/ngx_debug_pool/t/test.t                     | 1 +
 modules/ngx_debug_timer/t/test.t                    | 1 +
 modules/ngx_slab_stat/t/test.t                      | 1 +
 7 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci-arm64.yml b/.github/workflows/ci-arm64.yml
index 8ae19e3dd8..96be517c2d 100644
--- a/.github/workflows/ci-arm64.yml
+++ b/.github/workflows/ci-arm64.yml
@@ -64,6 +64,7 @@ jobs:
               --add-module=./modules/ngx_backtrace_module \
               --add-module=./modules/ngx_debug_pool \
               --add-module=./modules/ngx_debug_timer \
+              --add-module=./modules/ngx_debug_conn \
               --add-module=./modules/ngx_http_concat_module \
               --add-module=./modules/ngx_http_footer_filter_module \
               --add-module=./modules/ngx_http_lua_module \
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 570e196c42..24d618484c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -78,6 +78,7 @@ jobs:
             --add-module=./modules/ngx_backtrace_module \
             --add-module=./modules/ngx_debug_pool \
             --add-module=./modules/ngx_debug_timer \
+            --add-module=./modules/ngx_debug_conn \
             --add-module=./modules/ngx_http_concat_module \
             --add-module=./modules/ngx_http_footer_filter_module \
             --add-module=./modules/ngx_http_lua_module \
@@ -107,6 +108,9 @@ jobs:
          sudo cpanm --notest Net::DNS::Nameserver > build.log 2>&1 || (cat build.log && exit 1)
          prove -v -Inginx-tests/lib tengine-tests/
          prove -v -Inginx-tests/lib ../../modules/ngx_http_proxy_connect_module/t
+         prove -v -Inginx-tests/lib ../../modules/ngx_debug_timer/t
+         prove -v -Inginx-tests/lib ../../modules/ngx_debug_conn/t
+         prove -v -Inginx-tests/lib ../../modules/ngx_slab_stat/t
      - name: tengine test cases using test-nginx lib
        working-directory: tests/test-nginx
        run: |
diff --git a/modules/ngx_debug_conn/ngx_http_debug_conn_module.c b/modules/ngx_debug_conn/ngx_http_debug_conn_module.c
index bf6e6fbe8d..851d5ba970 100644
--- a/modules/ngx_debug_conn/ngx_http_debug_conn_module.c
+++ b/modules/ngx_debug_conn/ngx_http_debug_conn_module.c
@@ -10,7 +10,7 @@
 
 
 #if (NGX_DEBUG_POOL)
-extern size_t ngx_pool_size(ngx_pool_t *);
+#define ngx_pool_size(p) ((p)->size)
 #else
 #define ngx_pool_size(p) ((size_t) 0)
 #endif
diff --git a/modules/ngx_debug_conn/t/test.t b/modules/ngx_debug_conn/t/test.t
index b355665b24..8618fb9358 100755
--- a/modules/ngx_debug_conn/t/test.t
+++ b/modules/ngx_debug_conn/t/test.t
@@ -28,6 +28,7 @@ events {
 }
 
 http {
+    %%TEST_GLOBALS_HTTP%%
     server {
         listen       127.0.0.1:8080;
 
diff --git a/modules/ngx_debug_pool/t/test.t b/modules/ngx_debug_pool/t/test.t
index 3afce6baf9..c58712a6aa 100644
--- a/modules/ngx_debug_pool/t/test.t
+++ b/modules/ngx_debug_pool/t/test.t
@@ -28,6 +28,7 @@ events {
 }
 
 http {
+    %%TEST_GLOBALS_HTTP%%
     server {
         listen       127.0.0.1:8080;
 
diff --git a/modules/ngx_debug_timer/t/test.t b/modules/ngx_debug_timer/t/test.t
index d0476230de..8e7e2e3600 100755
--- a/modules/ngx_debug_timer/t/test.t
+++ b/modules/ngx_debug_timer/t/test.t
@@ -28,6 +28,7 @@ events {
 }
 
 http {
+    %%TEST_GLOBALS_HTTP%%
     server {
         listen       127.0.0.1:8080;
 
diff --git a/modules/ngx_slab_stat/t/test.t b/modules/ngx_slab_stat/t/test.t
index 0643ff2e3f..df1b1891db 100755
--- a/modules/ngx_slab_stat/t/test.t
+++ b/modules/ngx_slab_stat/t/test.t
@@ -27,6 +27,7 @@ events {
 }
 
 http {
+    %%TEST_GLOBALS_HTTP%%
 
     limit_req_zone $binary_remote_addr zone=one:10m rate=1r/s;