commit 3b67343ddbc34bb38703dd904404b105ec776fde
author Maciej Żenczykowski <maze@google.com> Sun Dec 18 20:26:12 2022 +0000
committer Maciej Żenczykowski <maze@google.com> Sun Dec 18 20:30:32 2022 +0000
tree 5debb021b57448786bc2182d6ad5e2382b864ac3
parent 9dac660bf072fe0701228b731e376052ec773e7b

remove TestTrafficControllerSetUp & TestSocketFilterSetUp

This is (as yet) dead code copied over from //system/netd,
but not yet plumbed into any p/m/C Android.bp file/test.

Update the bpf_shared.h include to netd.h now that that has been
renamed, see:
  https://android-review.git.corp.google.com/c/platform/packages/modules/Connectivity/+/2335387

MTS test bpf_existence_test.cpp already does a better job
of testing for bpf program/map existence, see
  MAINLINE_FOR_T_PLUS
  MAINLINE_FOR_T_4_14_PLUS

Test: N/A, this file is not yet compiled
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I2ccfd86e352118f6f76e91ec20e10a9285414490

tests/native/connectivity_native_test/bpf_base_test.cpp

diff --git a/tests/native/connectivity_native_test/bpf_base_test.cpp b/tests/native/connectivity_native_test/bpf_base_test.cpp
index f164b2f..624d216 100644
--- a/tests/native/connectivity_native_test/bpf_base_test.cpp
+++ b/tests/native/connectivity_native_test/bpf_base_test.cpp
@@ -37,7 +37,7 @@
 
 #include "bpf/BpfMap.h"
 #include "bpf/BpfUtils.h"
-#include "bpf_shared.h"
+#include "netd.h"
 
 using android::base::Result;
 
@@ -61,26 +61,6 @@
     ASSERT_EQ(0, access((cg2_path + "/cgroup.controllers").c_str(), R_OK));
 }
 
-TEST_F(BpfBasicTest, TestTrafficControllerSetUp) {
-    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));
-    ASSERT_EQ(0, access(XT_BPF_EGRESS_PROG_PATH, R_OK));
-    ASSERT_EQ(0, access(COOKIE_TAG_MAP_PATH, R_OK));
-    ASSERT_EQ(0, access(UID_COUNTERSET_MAP_PATH, R_OK));
-    ASSERT_EQ(0, access(STATS_MAP_A_PATH, R_OK));
-    ASSERT_EQ(0, access(STATS_MAP_B_PATH, R_OK));
-    ASSERT_EQ(0, access(IFACE_INDEX_NAME_MAP_PATH, R_OK));
-    ASSERT_EQ(0, access(IFACE_STATS_MAP_PATH, R_OK));
-    ASSERT_EQ(0, access(CONFIGURATION_MAP_PATH, R_OK));
-    ASSERT_EQ(0, access(UID_OWNER_MAP_PATH, R_OK));
-}
-
-TEST_F(BpfBasicTest, TestSocketFilterSetUp) {
-    ASSERT_EQ(0, access(CGROUP_SOCKET_PROG_PATH, R_OK));
-    ASSERT_EQ(0, access(UID_PERMISSION_MAP_PATH, R_OK));
-}
-
 TEST_F(BpfBasicTest, TestTagSocket) {
     BpfMap<uint64_t, UidTagValue> cookieTagMap(COOKIE_TAG_MAP_PATH);
     ASSERT_TRUE(cookieTagMap.isValid());