1 files changed, 0 insertions, 20 deletions
diff --git a/tests/bpf_base_test.cpp b/tests/bpf_base_test.cpp
index f28c5f81..7ab42904 100644
--- a/tests/bpf_base_test.cpp
+++ b/tests/bpf_base_test.cpp
@@ -56,25 +56,13 @@ class BpfBasicTest : public testing::Test {
 };
 
 TEST_F(BpfBasicTest, TestCgroupMounted) {
-    SKIP_IF_BPF_NOT_SUPPORTED;
-
     std::string cg2_path;
-#if 0
-    // This is the correct way to fetch cg2_path, but it occasionally hits ASAN
-    // problems due to memory allocated in non ASAN code being freed later by us
     ASSERT_EQ(true, CgroupGetControllerPath(CGROUPV2_CONTROLLER_NAME, &cg2_path));
-#else
-    ASSERT_EQ(true, CgroupGetControllerPath(CGROUPV2_CONTROLLER_NAME, nullptr));
-    // Constant derived from //system/core/libprocessgroup/profiles/cgroups.json
-    cg2_path = "/dev/cg2_bpf";
-#endif
     ASSERT_EQ(0, access(cg2_path.c_str(), R_OK));
     ASSERT_EQ(0, access((cg2_path + "/cgroup.controllers").c_str(), R_OK));
 }
 
 TEST_F(BpfBasicTest, TestTrafficControllerSetUp) {
-    SKIP_IF_BPF_NOT_SUPPORTED;
-
     ASSERT_EQ(0, access(BPF_EGRESS_PROG_PATH, R_OK));
     ASSERT_EQ(0, access(BPF_INGRESS_PROG_PATH, R_OK));
     ASSERT_EQ(0, access(XT_BPF_INGRESS_PROG_PATH, R_OK));
@@ -97,8 +85,6 @@ TEST_F(BpfBasicTest, TestSocketFilterSetUp) {
 }
 
 TEST_F(BpfBasicTest, TestTagSocket) {
-    SKIP_IF_BPF_NOT_SUPPORTED;
-
     BpfMap<uint64_t, UidTagValue> cookieTagMap(COOKIE_TAG_MAP_PATH);
     ASSERT_LE(0, cookieTagMap.getMap());
     int sock = socket(AF_INET6, SOCK_STREAM | SOCK_CLOEXEC, 0);
@@ -117,8 +103,6 @@ TEST_F(BpfBasicTest, TestTagSocket) {
 }
 
 TEST_F(BpfBasicTest, TestCloseSocketWithoutUntag) {
-    SKIP_IF_BPF_NOT_SUPPORTED;
-
     BpfMap<uint64_t, UidTagValue> cookieTagMap(COOKIE_TAG_MAP_PATH);
     ASSERT_LE(0, cookieTagMap.getMap());
     int sock = socket(AF_INET6, SOCK_STREAM | SOCK_CLOEXEC, 0);
@@ -144,8 +128,6 @@ TEST_F(BpfBasicTest, TestCloseSocketWithoutUntag) {
 }
 
 TEST_F(BpfBasicTest, TestChangeCounterSet) {
-    SKIP_IF_BPF_NOT_SUPPORTED;
-
     BpfMap<uint32_t, uint8_t> uidCounterSetMap(UID_COUNTERSET_MAP_PATH);
     ASSERT_LE(0, uidCounterSetMap.getMap());
     ASSERT_EQ(0, qtaguid_setCounterSet(TEST_COUNTERSET, TEST_UID));
@@ -160,8 +142,6 @@ TEST_F(BpfBasicTest, TestChangeCounterSet) {
 }
 
 TEST_F(BpfBasicTest, TestDeleteTagData) {
-    SKIP_IF_BPF_NOT_SUPPORTED;
-
     BpfMap<StatsKey, StatsValue> statsMapA(STATS_MAP_A_PATH);
     ASSERT_LE(0, statsMapA.getMap());
     BpfMap<StatsKey, StatsValue> statsMapB(STATS_MAP_B_PATH);