From 0456900bf29f968e0aad720ba94a8d17be87d3e8 Mon Sep 17 00:00:00 2001 From: Hungming Chen Date: Wed, 16 Feb 2022 16:02:49 +0800 Subject: [PATCH] Skip BpfExistenceTest#TestPrograms on BPF unsupported device BPF is supported after kernel 4.9. Skip the test on BPF unsupported device. Ex: walleye. Bug: 219696135 Test: atest bpf_existence_test on walleye Change-Id: I583a858587c0501582c9e77c8b584b3136312cd5 --- tests/mts/Android.bp | 3 +++ tests/mts/bpf_existence_test.cpp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/tests/mts/Android.bp b/tests/mts/Android.bp index 2c4401043e..74fee3d7ad 100644 --- a/tests/mts/Android.bp +++ b/tests/mts/Android.bp @@ -27,6 +27,9 @@ cc_test { "connectivity-mainline-presubmit-cc-defaults", ], require_root: true, + header_libs: [ + "bpf_headers", + ], static_libs: [ "libbase", "libmodules-utils-build", diff --git a/tests/mts/bpf_existence_test.cpp b/tests/mts/bpf_existence_test.cpp index 142e01334d..2bba282d6d 100644 --- a/tests/mts/bpf_existence_test.cpp +++ b/tests/mts/bpf_existence_test.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #include @@ -151,6 +152,8 @@ void checkFiles() { } TEST_F(BpfExistenceTest, TestPrograms) { + SKIP_IF_BPF_NOT_SUPPORTED; + // Pre-flight check to ensure test has been updated. uint64_t buildVersionSdk = android_get_device_api_level(); ASSERT_NE(0, buildVersionSdk) << "Unable to determine device SDK version";