summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Żenczykowski <maze@google.com>2021-03-12 10:43:35 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-03-12 10:43:35 +0000
commit1ebce20b0f778c7927936a55fba86ef2ad8a0330 (patch)
tree47885db646a17674f523f878538ea0d3a436e0d8
parentade234047b9055421127a549be896b21f480dd7e (diff)
parentc5468f82d4b31c2987221ba6b79b03d18bb3609f (diff)
downloadbpf-1ebce20b0f778c7927936a55fba86ef2ad8a0330.tar.gz
BpfUtils.h - add back SKIP_IF_BPF_NOT_SUPPORTED macro am: 67fa2073ff am: 625c2c6bc6 am: c5468f82d4
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/1631935 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0e6a740dcb11c9c8ea73ba9aa8646e473a5a3242
-rw-r--r--libbpf_android/include/bpf/BpfUtils.h16
1 files changed, 16 insertions, 0 deletions
diff --git a/libbpf_android/include/bpf/BpfUtils.h b/libbpf_android/include/bpf/BpfUtils.h
index 9671b8a..8fd2a4a 100644
--- a/libbpf_android/include/bpf/BpfUtils.h
+++ b/libbpf_android/include/bpf/BpfUtils.h
@@ -45,6 +45,22 @@ 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; \
+ } \
+ } 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; \
+ } \
+ } while (0)
+
#define SKIP_IF_EXTENDED_BPF_NOT_SUPPORTED \
do { \
if (!android::bpf::isAtLeastKernelVersion(4, 14, 0)) { \