test

Kong · Nov 17, 2023 · e63e9fe · e63e9fe
1 parent b4c840b
commit e63e9fe
Show file tree

Hide file tree

Showing 29 changed files with 97 additions and 34 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -147,7 +147,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        label: [""]
+        label: ["wasmer_full"]
         os: [ubuntu-22.04]
         cc: [gcc-12]
         ngx: [1.25.3]
@@ -160,31 +160,56 @@ jobs:
         debug: [debug]
         include:
           # Wasmtime
-          - runtime: wasmtime
+          - label: wasmtime
+            runtime: wasmtime
             wasmtime: 14.0.3
             os: ubuntu-22.04
             cc: gcc-12
             ngx: 1.25.3
             hup: no_hup
             debug: debug
+            path: t/01-wasm
           # V8
-          - runtime: v8
+          - label: v8
+            runtime: v8
             v8: 11.4.183.23
             os: ubuntu-22.04
             cc: gcc-12
             ngx: 1.25.3
             debug: debug
             hup: no_hup
+            path: t/01-wasm
           # OpenResty
           - label: openresty
+            runtime: wasmer
+            wasmer: 3.1.1
             os: ubuntu-22.04
             cc: gcc-12
             openresty: 1.21.4.2
             ngx:
+            debug: debug
+            hup: no_hup
+            path: t/04-openresty
+          # Wasmtime hfuncs
+          - label: wasmtime_hfuncs
+            runtime: wasmtime
+            wasmtime: 14.0.3
+            os: ubuntu-22.04
+            cc: gcc-12
+            ngx: 1.25.3
+            hup: no_hup
+            debug: debug
+            path: t/03-proxy_wasm/hfuncs
+          # Wasmer hfuncs
+          - label: wasmer_hfuncs
             runtime: wasmer
             wasmer: 3.1.1
-            debug: debug
+            os: ubuntu-22.04
+            cc: gcc-12
+            ngx: 1.25.3
             hup: no_hup
+            debug: debug
+            path: t/03-proxy_wasm/hfuncs
     uses: ./.github/workflows/job-valgrind-tests.yml
     with:
       os: ${{ matrix.os }}

diff --git a/.github/workflows/job-valgrind-tests.yml b/.github/workflows/job-valgrind-tests.yml
@@ -33,6 +33,9 @@ on:
       hup:
         required: true
         type: string
+      path:
+        required: false
+        type: string
 
 defaults:
   run:
@@ -46,6 +49,7 @@ env:
   NGX_BUILD_CC_OPT: '-O2'
   NGX_BUILD_NOPOOL: 1
   TEST_NGINX_USE_VALGRIND: 1
+  TEST_NGINX_USE_VALGRIND_ALL: ${{ inputs.path == '' && 0 || 1 }}
   TEST_NGINX_USE_HUP: ${{ inputs.hup == 'hup' && 1 || 0 }}
   TEST_NGINX_RANDOMIZE: 1
   TEST_NGINX_NO_CLEAN: 1
@@ -101,7 +105,10 @@ jobs:
           ghcr_password: ${{ secrets.TOKEN_GITHUB }}
       - run: make setup
       - run: make
-      - run: make test 2>&1 | tee valgrind.out
+      #- run: make test 2>&1 | tee valgrind.out
+      - run: |
+           IN_PATH="${{ inputs.path }}"
+           ./util/test.sh ${IN_PATH:-t/} 2>&1 | tee valgrind.out
       - run: |
           awk -f ./util/parse-valgrind.awk valgrind.out > valgrind.log
           if [[ -s valgrind.log ]]; then

diff --git a/t/01-wasm/002-shm_queue_sanity.t b/t/01-wasm/002-shm_queue_sanity.t
@@ -6,7 +6,7 @@ use t::TestWasm;
 
 workers(2);
 master_on();
-skip_valgrind();
+#skip_valgrind();
 
 plan tests => repeat_each() * (blocks() * 5);
 

diff --git a/t/01-wasm/003-shm_kv_sanity.t b/t/01-wasm/003-shm_kv_sanity.t
@@ -6,7 +6,7 @@ use t::TestWasm;
 
 workers(2);
 master_on();
-skip_valgrind();
+#skip_valgrind();
 
 plan tests => repeat_each() * (blocks() * 5);
 

diff --git a/t/01-wasm/directives/001-module_directive.t b/t/01-wasm/directives/001-module_directive.t
@@ -8,13 +8,12 @@ our $nginxV = $t::TestWasm::nginxV;
 
 plan tests => repeat_each() * (blocks() * 4);
 
+no_shuffle();
 run_tests();
 
 __DATA__
 
 === TEST 1: module directive - valid .wasm module
-Too slow for Valgrind
---- skip_valgrind: 4
 --- main_config eval
 qq{
     wasm {
@@ -67,6 +66,7 @@ qr/\[debug\] .*? wasm loading "b" module bytes from ".*?a\.wat"/]
 
 
 === TEST 4: module directive - invalid arguments
+--- skip_valgrind: 4
 --- main_config
     wasm {
         module $TEST_NGINX_HTML_DIR/a.wat;
@@ -81,6 +81,7 @@ qr/\[emerg\] .*? invalid number of arguments in "module" directive/
 
 
 === TEST 5: module directive - bad name
+--- skip_valgrind: 4
 --- main_config
     wasm {
         module '' $TEST_NGINX_HTML_DIR/a.wat;
@@ -95,6 +96,7 @@ qr/\[emerg\] .*? invalid module name ""/
 
 
 === TEST 6: module directive - bad path
+--- skip_valgrind: 4
 --- main_config
     wasm {
         module a '';
@@ -109,6 +111,7 @@ qr/\[emerg\] .*? invalid module path ""/
 
 
 === TEST 7: module directive - already defined
+--- skip_valgrind: 4
 --- main_config
     wasm {
         module a $TEST_NGINX_HTML_DIR/a.wat;
@@ -127,6 +130,7 @@ qr/\[emerg\] .*? "a" module already defined/
 
 
 === TEST 8: module directive - no such path
+--- skip_valgrind: 4
 --- main_config
     wasm {
         module a $TEST_NGINX_HTML_DIR/none.wat;
@@ -141,6 +145,7 @@ qr/\[emerg\] .*? \[wasm\] open\(\) ".*?none\.wat" failed \(2: No such file or di
 
 
 === TEST 9: module directive - no .wat bytes - wasmtime, wasmer
+--- skip_valgrind: 4
 --- skip_eval: 4: !( $::nginxV =~ m/wasmtime/ || $::nginxV =~ m/wasmer/ )
 --- main_config
     wasm {
@@ -160,6 +165,7 @@ qr/\[emerg\] .*? \[wasm\] open\(\) ".*?none\.wat" failed \(2: No such file or di
 
 
 === TEST 10: module directive - no .wat bytes - v8
+--- skip_valgrind: 4
 --- skip_eval: 4: $::nginxV !~ m/v8/
 --- main_config
     wasm {
@@ -179,6 +185,7 @@ qr/\[emerg\] .*? \[wasm\] open\(\) ".*?none\.wat" failed \(2: No such file or di
 
 
 === TEST 11: module directive - no .wasm bytes
+--- skip_valgrind: 4
 --- main_config
     wasm {
         module a $TEST_NGINX_HTML_DIR/a.wasm;
@@ -197,6 +204,7 @@ qr/\[emerg\] .*? \[wasm\] open\(\) ".*?none\.wat" failed \(2: No such file or di
 
 
 === TEST 12: module directive - invalid .wat module - wasmtime, wasmer
+--- skip_valgrind: 4
 --- skip_eval: 4: !( $::nginxV =~ m/wasmtime/ || $::nginxV =~ m/wasmer/ )
 --- main_config
     wasm {
@@ -219,6 +227,7 @@ qr/\[emerg\] .*? \[wasm\] open\(\) ".*?none\.wat" failed \(2: No such file or di
 
 
 === TEST 13: module directive - invalid .wat module - v8
+--- skip_valgrind: 4
 --- skip_eval: 4: $::nginxV !~ m/v8/
 --- main_config
     wasm {

diff --git a/t/01-wasm/directives/002-compiler_directive.t b/t/01-wasm/directives/002-compiler_directive.t
@@ -4,7 +4,7 @@ use strict;
 use lib '.';
 use t::TestWasm;
 
-skip_valgrind();
+skip_valgrind('always');
 
 our $nginxV = $t::TestWasm::nginxV;
 

diff --git a/t/01-wasm/directives/003-shm_directives.t b/t/01-wasm/directives/003-shm_directives.t
@@ -4,7 +4,7 @@ use strict;
 use lib '.';
 use t::TestWasm;
 
-skip_valgrind();
+#skip_valgrind('always');
 
 plan tests => repeat_each() * (blocks() * 5);
 

diff --git a/t/01-wasm/directives/004-resolver_directive.t b/t/01-wasm/directives/004-resolver_directive.t
@@ -4,7 +4,7 @@ use strict;
 use lib '.';
 use t::TestWasm;
 
-skip_valgrind();
+#skip_valgrind();
 
 plan tests => repeat_each() * (blocks() * 4);
 

diff --git a/t/01-wasm/directives/005-socket_directives.t b/t/01-wasm/directives/005-socket_directives.t
@@ -4,7 +4,7 @@ use strict;
 use lib '.';
 use t::TestWasm;
 
-skip_valgrind();
+#skip_valgrind();
 
 plan tests => repeat_each() * (blocks() * 4);
 

diff --git a/t/01-wasm/directives/006-backtraces_directive.t b/t/01-wasm/directives/006-backtraces_directive.t
@@ -4,7 +4,7 @@ use strict;
 use lib '.';
 use t::TestWasm;
 
-skip_valgrind('wasmtime');
+#skip_valgrind('wasmtime');
 
 our $nginxV = $t::TestWasm::nginxV;
 

diff --git a/t/01-wasm/directives/008-flag_directive_wasmtime.t b/t/01-wasm/directives/008-flag_directive_wasmtime.t
@@ -4,7 +4,7 @@ use strict;
 use lib '.';
 use t::TestWasm;
 
-skip_valgrind();
+skip_valgrind('always');
 
 our $nginxV = $t::TestWasm::nginxV;
 our $osname = $t::TestWasm::osname;

diff --git a/t/01-wasm/directives/009-flag_directive_wasmer.t b/t/01-wasm/directives/009-flag_directive_wasmer.t
@@ -4,7 +4,7 @@ use strict;
 use lib '.';
 use t::TestWasm;
 
-skip_valgrind();
+skip_valgrind('always');
 
 our $nginxV = $t::TestWasm::nginxV;
 

diff --git a/t/01-wasm/directives/010-flag_directive_v8.t b/t/01-wasm/directives/010-flag_directive_v8.t
@@ -4,7 +4,7 @@ use strict;
 use lib '.';
 use t::TestWasm;
 
-skip_valgrind();
+skip_valgrind('always');
 
 our $nginxV = $t::TestWasm::nginxV;
 

diff --git a/t/01-wasm/hfuncs/001-log.t b/t/01-wasm/hfuncs/001-log.t
@@ -4,7 +4,7 @@ use strict;
 use lib '.';
 use t::TestWasm;
 
-skip_valgrind();
+skip_valgrind('always');
 
 plan tests => repeat_each() * (blocks() * 3);
 

diff --git a/t/02-http/002-wasm_oob.t b/t/02-http/002-wasm_oob.t
@@ -4,15 +4,14 @@ use strict;
 use lib '.';
 use t::TestWasm;
 
-skip_valgrind();
-
 plan tests => repeat_each() * (blocks() * 4);
 
 run_tests();
 
 __DATA__
 
 === TEST 1: wasm - oob memory read
+--- skip_valgrind: 4
 --- main_config
     wasm {
         module a $TEST_NGINX_HTML_DIR/a.wat;
@@ -41,6 +40,7 @@ qr/(\[error\] .*? out of bounds|wasm trap: out of bounds memory access|Uncaught
 
 
 === TEST 2: wasm - oob memory write
+--- skip_valgrind: 4
 --- main_config
     wasm {
         module a $TEST_NGINX_HTML_DIR/a.wat;

diff --git a/t/03-proxy_wasm/hfuncs/106-proxy_get_http_response_header.t b/t/03-proxy_wasm/hfuncs/106-proxy_get_http_response_header.t
@@ -301,6 +301,7 @@ resp header "connection: close".*/
 
 
 === TEST 10: proxy_wasm - get_http_response_header() get Connection header (keep-alive)
+--- skip_valgrind: 5
 --- timeout_expected: 5
 --- abort
 --- load_nginx_modules: ngx_http_echo_module
@@ -379,6 +380,7 @@ resp header "connection: upgrade".*/
 
 
 === TEST 12: proxy_wasm - get_http_response_header() get Keep-Alive header
+--- skip_valgrind: 5
 --- timeout_expected: 5
 --- abort
 --- load_nginx_modules: ngx_http_echo_module

diff --git a/t/03-proxy_wasm/hfuncs/111-proxy_set_http_request_header.t b/t/03-proxy_wasm/hfuncs/111-proxy_set_http_request_header.t
@@ -160,6 +160,7 @@ qr/.*? on_request_headers, 22 headers.*
 
 
 === TEST 7: proxy_wasm - set_http_request_header() sets Connection header (keep-alive)
+--- skip_valgrind: 5
 --- timeout_expected: 5
 --- abort
 --- wasm_modules: hostcalls

diff --git a/t/03-proxy_wasm/hfuncs/112-proxy_set_http_response_header.t b/t/03-proxy_wasm/hfuncs/112-proxy_set_http_response_header.t
@@ -199,6 +199,7 @@ resp Connection: upgrade.*/
 
 
 === TEST 8: proxy_wasm - set_http_response_header() sets Connection header (keep-alive)
+--- skip_valgrind: 5
 --- timeout_expected: 5
 --- abort
 --- wasm_modules: hostcalls

diff --git a/t/03-proxy_wasm/hfuncs/contexts/002-set_tick_period.t b/t/03-proxy_wasm/hfuncs/contexts/002-set_tick_period.t
@@ -6,7 +6,7 @@ use t::TestWasm;
 
 skip_hup();
 skip_no_debug();
-skip_valgrind();
+skip_valgrind('always');
 
 plan tests => repeat_each() * (blocks() * 4);
 

diff --git a/t/03-proxy_wasm/hfuncs/contexts/100-proxy_log.t b/t/03-proxy_wasm/hfuncs/contexts/100-proxy_log.t
@@ -6,7 +6,7 @@ use t::TestWasm;
 
 skip_hup();
 skip_no_debug();
-skip_valgrind();
+skip_valgrind('always');
 
 plan tests => repeat_each() * (blocks() * 4);
 

diff --git a/t/03-proxy_wasm/hfuncs/contexts/113-proxy_get_http_request_body.t b/t/03-proxy_wasm/hfuncs/contexts/113-proxy_get_http_request_body.t
@@ -6,7 +6,7 @@ use t::TestWasm;
 
 skip_hup();
 skip_no_debug();
-skip_valgrind();
+skip_valgrind('always');
 
 plan tests => repeat_each() * (blocks() * 4);
 

diff --git a/t/03-proxy_wasm/hfuncs/contexts/114-proxy_set_http_request_body.t b/t/03-proxy_wasm/hfuncs/contexts/114-proxy_set_http_request_body.t
@@ -6,7 +6,7 @@ use t::TestWasm;
 
 skip_hup();
 skip_no_debug();
-skip_valgrind();
+skip_valgrind('always');
 
 plan tests => repeat_each() * (blocks() * 4);
 

diff --git a/t/03-proxy_wasm/hfuncs/contexts/115-proxy_get_http_response_body.t b/t/03-proxy_wasm/hfuncs/contexts/115-proxy_get_http_response_body.t
@@ -6,7 +6,7 @@ use t::TestWasm;
 
 skip_hup();
 skip_no_debug();
-skip_valgrind();
+skip_valgrind('always');
 
 plan tests => repeat_each() * (blocks() * 4);