commit 23e5c7fa5677b017d2ac2ce25f897bb3788f2239
author Lorenzo Colitti <lorenzo@google.com> Fri Jan 12 17:55:59 2018 +0900
committer Lorenzo Colitti <lorenzo@google.com> Fri Jan 12 21:36:32 2018 +0900
tree 1a06bd54c1dfaa038593a1e6935e843ddb278e73
parent a7db1a06b064c0bf9b989bbe459a6b07f2a5b526

Skip the BPF tests if the kernel does not support BPF.

Test: all TrafficControllerTest tests are correctly skipped on walleye
Change-Id: I3c3c03da3b91cc27d63eedaa73f0c9e8ac3a54d2

server/TrafficControllerTest.cpp

diff --git a/server/TrafficControllerTest.cpp b/server/TrafficControllerTest.cpp
index a4cb510..7c41fa9 100644
--- a/server/TrafficControllerTest.cpp
+++ b/server/TrafficControllerTest.cpp
@@ -57,6 +57,8 @@
 constexpr int TEST_COUNTERSET = 1;
 constexpr int DEFAULT_COUNTERSET = 0;
 
+#define SKIP_IF_BPF_NOT_SUPPORTED do { if (!bpfSupported()) return; } while(0);
+
 class TrafficControllerTest : public ::testing::Test {
   protected:
     TrafficControllerTest() {}
@@ -67,6 +69,8 @@
     unique_fd mFakeTagStatsMap;
 
     void SetUp() {
+        SKIP_IF_BPF_NOT_SUPPORTED;
+
         mFakeCookieTagMap = unique_fd(createMap(BPF_MAP_TYPE_HASH, sizeof(uint64_t),
                                                 sizeof(struct UidTag), TEST_MAP_SIZE, 0));
         ASSERT_LE(0, mFakeCookieTagMap);
@@ -140,6 +144,8 @@
 };
 
 TEST_F(TrafficControllerTest, TestTagSocketV4) {
+    SKIP_IF_BPF_NOT_SUPPORTED;
+
     uint64_t sockCookie;
     int v4socket = setUpSocketAndTag(AF_INET, &sockCookie, TEST_TAG, TEST_UID);
     expectUidTag(sockCookie, TEST_UID, TEST_TAG);
@@ -149,6 +155,8 @@
 }
 
 TEST_F(TrafficControllerTest, TestReTagSocket) {
+    SKIP_IF_BPF_NOT_SUPPORTED;
+
     uint64_t sockCookie;
     int v4socket = setUpSocketAndTag(AF_INET, &sockCookie, TEST_TAG, TEST_UID);
     expectUidTag(sockCookie, TEST_UID, TEST_TAG);
@@ -157,6 +165,8 @@
 }
 
 TEST_F(TrafficControllerTest, TestTagTwoSockets) {
+    SKIP_IF_BPF_NOT_SUPPORTED;
+
     uint64_t sockCookie1;
     uint64_t sockCookie2;
     int v4socket1 = setUpSocketAndTag(AF_INET, &sockCookie1, TEST_TAG, TEST_UID);
@@ -171,6 +181,8 @@
 }
 
 TEST_F(TrafficControllerTest, TestTagSocketV6) {
+    SKIP_IF_BPF_NOT_SUPPORTED;
+
     uint64_t sockCookie;
     int v6socket = setUpSocketAndTag(AF_INET6, &sockCookie, TEST_TAG, TEST_UID);
     expectUidTag(sockCookie, TEST_UID, TEST_TAG);
@@ -180,12 +192,16 @@
 }
 
 TEST_F(TrafficControllerTest, TestTagInvalidSocket) {
+    SKIP_IF_BPF_NOT_SUPPORTED;
+
     int invalidSocket = -1;
     ASSERT_GT(0, mTc.tagSocket(invalidSocket, TEST_TAG, TEST_UID));
     expectTagMapEmpty();
 }
 
 TEST_F(TrafficControllerTest, TestUntagInvalidSocket) {
+    SKIP_IF_BPF_NOT_SUPPORTED;
+
     int invalidSocket = -1;
     ASSERT_GT(0, mTc.untagSocket(invalidSocket));
     int v4socket = socket(AF_INET, SOCK_STREAM, 0);
@@ -194,6 +210,8 @@
 }
 
 TEST_F(TrafficControllerTest, TestSetCounterSet) {
+    SKIP_IF_BPF_NOT_SUPPORTED;
+
     ASSERT_EQ(0, mTc.setCounterSet(TEST_COUNTERSET, TEST_UID));
     uid_t uid = TEST_UID;
     int counterSetResult;
@@ -206,6 +224,8 @@
 }
 
 TEST_F(TrafficControllerTest, TestSetInvalidCounterSet) {
+    SKIP_IF_BPF_NOT_SUPPORTED;
+
     ASSERT_GT(0, mTc.setCounterSet(COUNTERSETS_LIMIT, TEST_UID));
     uid_t uid = TEST_UID;
     int counterSetResult;
@@ -215,6 +235,8 @@
 }
 
 TEST_F(TrafficControllerTest, TestDeleteTagData) {
+    SKIP_IF_BPF_NOT_SUPPORTED;
+
     uint64_t cookie = 1;
     uid_t uid = TEST_UID;
     uint32_t tag = TEST_TAG;
@@ -234,6 +256,8 @@
 }
 
 TEST_F(TrafficControllerTest, TestDeleteAllUidData) {
+    SKIP_IF_BPF_NOT_SUPPORTED;
+
     uint64_t cookie = 1;
     uid_t uid = TEST_UID;
     uint32_t tag = TEST_TAG;
@@ -255,6 +279,8 @@
 }
 
 TEST_F(TrafficControllerTest, TestDeleteDataWithTwoTags) {
+    SKIP_IF_BPF_NOT_SUPPORTED;
+
     uint64_t cookie1 = 1;
     uint64_t cookie2 = 2;
     uid_t uid = TEST_UID;
@@ -281,6 +307,8 @@
 }
 
 TEST_F(TrafficControllerTest, TestDeleteDataWithTwoUids) {
+    SKIP_IF_BPF_NOT_SUPPORTED;
+
     uint64_t cookie1 = 1;
     uint64_t cookie2 = 2;
     uid_t uid1 = TEST_UID;