From 5460527c74262b77a7d38732f0fce34efd24dd68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= <maze@google.com>
Date: Fri, 17 Sep 2021 15:27:42 -0700
Subject: [PATCH] BpfUtils.h - switch to GTEST_SKIP in all 4 SKIP macros
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Test: TreeHugger, atest libbpf_android_test netd_unit_test netd_integration_test
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I3acb47a432378f257418f81b26516e18d6ff3780
---
 libbpf_android/include/bpf/BpfUtils.h | 42 ++++++++++-----------------
 1 file changed, 16 insertions(+), 26 deletions(-)

diff --git a/libbpf_android/include/bpf/BpfUtils.h b/libbpf_android/include/bpf/BpfUtils.h
index 8fd2a4a..f0d73e0 100644
--- a/libbpf_android/include/bpf/BpfUtils.h
+++ b/libbpf_android/include/bpf/BpfUtils.h
@@ -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