test

Kong · Nov 16, 2023 · e9015ff · e9015ff
1 parent 79da0c8
commit e9015ff
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -185,6 +185,25 @@ jobs:
             wasmer: 3.1.1
             debug: debug
             hup: no_hup
+            path: t/04-openresty
+          # 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
+          - runtime: wasmer
+            wasmer: 3.1.1
+            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="${{ github.event.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/TestWasm.pm b/t/TestWasm.pm
@@ -231,7 +231,7 @@ add_block_preprocessor(sub {
         && $ENV{TEST_NGINX_USE_VALGRIND}
         && $block->skip_valgrind =~ m/\s*(\d+)/)
     {
-        $block->set_value("skip_eval", sprintf '%d: $ENV{TEST_NGINX_USE_VALGRIND} && !$ENV{TEST_NGINX_USE_VALGRIND_ALL}', $1);
+        $block->set_value("skip_eval", sprintf '%d: $ENV{TEST_NGINX_USE_VALGRIND}', $1);
     }
 
     # --- timeout_expected: 1