diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-12-18 19:29:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-12-18 19:29:35 +0000 |
| commit | 8c1ca2c8b133d2950a42308042ba03aba874c8c0 (patch) | |
| tree | d57e94c9038215c90d35a5670736be09bec061e3 | |
| parent | 9742b12b1bd13aa1895dbd2475a188678abf61fd (diff) | |
| parent | caa786bd0d22b9a20387e6546b1fcab2c85043c4 (diff) | |
| download | netd-8c1ca2c8b133d2950a42308042ba03aba874c8c0.tar.gz | |
Merge "adjust tests for less exposing BpfMap.h" into tm-mainline-prod
| -rw-r--r-- | tests/benchmarks/bpf_benchmark.cpp | 1 | ||||
| -rw-r--r-- | tests/bpf_base_test.cpp | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/benchmarks/bpf_benchmark.cpp b/tests/benchmarks/bpf_benchmark.cpp index bf4bd541..4de80661 100644 --- a/tests/benchmarks/bpf_benchmark.cpp +++ b/tests/benchmarks/bpf_benchmark.cpp @@ -18,6 +18,7 @@ #include <android-base/stringprintf.h> #include <benchmark/benchmark.h> +#define BPF_MAP_MAKE_VISIBLE_FOR_TESTING #include "bpf/BpfMap.h" #include "bpf/BpfUtils.h" diff --git a/tests/bpf_base_test.cpp b/tests/bpf_base_test.cpp index 52311c4a..f164b2f3 100644 --- a/tests/bpf_base_test.cpp +++ b/tests/bpf_base_test.cpp @@ -83,7 +83,7 @@ TEST_F(BpfBasicTest, TestSocketFilterSetUp) { TEST_F(BpfBasicTest, TestTagSocket) { BpfMap<uint64_t, UidTagValue> cookieTagMap(COOKIE_TAG_MAP_PATH); - ASSERT_LE(0, cookieTagMap.getMap()); + ASSERT_TRUE(cookieTagMap.isValid()); int sock = socket(AF_INET6, SOCK_STREAM | SOCK_CLOEXEC, 0); ASSERT_LE(0, sock); uint64_t cookie = getSocketCookie(sock); @@ -101,7 +101,7 @@ TEST_F(BpfBasicTest, TestTagSocket) { TEST_F(BpfBasicTest, TestCloseSocketWithoutUntag) { BpfMap<uint64_t, UidTagValue> cookieTagMap(COOKIE_TAG_MAP_PATH); - ASSERT_LE(0, cookieTagMap.getMap()); + ASSERT_TRUE(cookieTagMap.isValid()); int sock = socket(AF_INET6, SOCK_STREAM | SOCK_CLOEXEC, 0); ASSERT_LE(0, sock); uint64_t cookie = getSocketCookie(sock); |