Skip to content

Commit fe465b7

Browse files
committed
run-vmtest: conditionally pass -m to test_progs
Use TEST_PROGS_TRAFFIC_MONITOR env variable to control whether to enable traffic monitor in test_progs. It depends on selftests being built with libpcap-dev. Signed-off-by: Ihor Solodrai <[email protected]>
1 parent 40e5f9d commit fe465b7

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

.github/workflows/kernel-test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ jobs:
7272
KERNEL_TEST: ${{ inputs.test }}
7373
SELFTESTS_BPF: ${{ github.workspace }}/selftests/bpf
7474
VMTEST_CONFIGS: ${{ github.workspace }}/ci/vmtest/configs
75+
TEST_PROGS_TRAFFIC_MONITOR: ${{ inputs.arch == 'x86_64' && 'true' || '' }}
7576
TEST_PROGS_WATCHDOG_TIMEOUT: 300
7677
with:
7778
arch: ${{ inputs.arch }}

run-vmtest/run-bpf-selftests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ test_progs_helper() {
4242
args+=(${ALLOWLIST_FILE:+-a@$ALLOWLIST_FILE})
4343
args+=(${DENYLIST_FILE:+-d@$DENYLIST_FILE})
4444
args+=(-J "${json_file}")
45-
args+=(-m '*')
45+
args+=(${TEST_PROGS_TRAFFIC_MONITOR:+-m '*'})
4646

4747
foldable start ${selftest} "Testing ${selftest}"
4848
echo "./${selftest}" "${args[@]}"

0 commit comments

Comments
 (0)