BpfUtils.h - switch to GTEST_SKIP in all 4 SKIP macros

Test: TreeHugger, atest libbpf_android_test netd_unit_test netd_integration_test
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I3acb47a432378f257418f81b26516e18d6ff3780
This commit is contained in:
Maciej Żenczykowski 2021-09-17 15:27:42 -07:00
parent fa03239a81
commit 5460527c74

View file

@ -45,38 +45,28 @@ static inline bool isAtLeastKernelVersion(unsigned major, unsigned minor, unsign
return kernelVersion() >= KVER(major, minor, sub);
}
#define SKIP_IF_BPF_SUPPORTED \
do { \
if (android::bpf::isAtLeastKernelVersion(4, 9, 0)) { \
GTEST_LOG_(INFO) << "This test is skipped since bpf is supported\n"; \
return; \
} \
#define SKIP_IF_BPF_SUPPORTED \
do { \
if (android::bpf::isAtLeastKernelVersion(4, 9, 0)) \
GTEST_SKIP() << "Skip: bpf is supported."; \
} while (0)
#define SKIP_IF_BPF_NOT_SUPPORTED \
do { \
if (!android::bpf::isAtLeastKernelVersion(4, 9, 0)) { \
GTEST_LOG_(INFO) << "This test is skipped since bpf is not supported\n"; \
return; \
} \
#define SKIP_IF_BPF_NOT_SUPPORTED \
do { \
if (!android::bpf::isAtLeastKernelVersion(4, 9, 0)) \
GTEST_SKIP() << "Skip: bpf is not supported."; \
} while (0)
#define SKIP_IF_EXTENDED_BPF_NOT_SUPPORTED \
do { \
if (!android::bpf::isAtLeastKernelVersion(4, 14, 0)) { \
GTEST_LOG_(INFO) << "This test is skipped since extended bpf feature" \
<< "not supported\n"; \
return; \
} \
#define SKIP_IF_EXTENDED_BPF_NOT_SUPPORTED \
do { \
if (!android::bpf::isAtLeastKernelVersion(4, 14, 0)) \
GTEST_SKIP() << "Skip: extended bpf feature not supported."; \
} while (0)
#define SKIP_IF_XDP_NOT_SUPPORTED \
do { \
if (!android::bpf::isAtLeastKernelVersion(5, 9, 0)) { \
GTEST_LOG_(INFO) << "This test is skipped since xdp" \
<< "not supported\n"; \
return; \
} \
#define SKIP_IF_XDP_NOT_SUPPORTED \
do { \
if (!android::bpf::isAtLeastKernelVersion(5, 9, 0)) \
GTEST_SKIP() << "Skip: xdp not supported."; \
} while (0)
} // namespace bpf