run-vmtest: pass watchdog timeout to test_progs

Signed-off-by: Ihor Solodrai <ihor.solodrai@pm.me>
libbpf · Nov 22, 2024 · df8e00b · df8e00b
1 parent 2faf25f
commit df8e00b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/.github/workflows/kernel-build.yml b/.github/workflows/kernel-build.yml
@@ -96,7 +96,7 @@ jobs:
         with:
           arch: ${{ inputs.arch }}
           llvm-version: ${{ inputs.llvm-version }}
-          pahole: c2f89dab3f2b0ebb53bab3ed8be32f41cb743c37
+          pahole: master
       - name: Print toolchain version used
         shell: bash
         run: |

diff --git a/.github/workflows/kernel-test.yml b/.github/workflows/kernel-test.yml
@@ -84,6 +84,8 @@ jobs:
         # booleans are weird in GH.
         continue-on-error: ${{ fromJSON(env.CONTINUE_ON_ERROR) }}
         timeout-minutes: ${{ inputs.timeout_minutes }}
+        env:
+          TEST_PROGS_WATCHDOG_TIMEOUT: 300
         with:
           arch: ${{ inputs.arch }}
           vmlinuz: '${{ github.workspace }}/vmlinuz'

diff --git a/run-vmtest/run-bpf-selftests.sh b/run-vmtest/run-bpf-selftests.sh
@@ -32,6 +32,8 @@ test_progs_helper() {
   local selftest="test_progs${1}"
   local args="$2"
 
+  args+=" ${TEST_PROGS_WATCHDOG_TIMEOUT:+-w$TEST_PROGS_WATCHDOG_TIMEOUT}"
+
   json_file=${selftest/-/_}
   if [ "$2" == "-j" ]
   then
@@ -40,6 +42,7 @@ test_progs_helper() {
   json_file="${OUTPUT_DIR}/${json_file}.json"
 
   foldable start ${selftest} "Testing ${selftest}"
+  echo "./${selftest} ${args} ${DENYLIST:+-d\"$DENYLIST\"} ${ALLOWLIST:+-a\"$ALLOWLIST\"} --json-summary \"${json_file}\""
   # "&& true" does not change the return code (it is not executed
   # if the Python script fails), but it prevents exiting on a
   # failure due to the "set -e".