diff options
Diffstat (limited to 'libbpf_android/BpfLoadTest.cpp')
-rw-r--r-- | libbpf_android/BpfLoadTest.cpp | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/libbpf_android/BpfLoadTest.cpp b/libbpf_android/BpfLoadTest.cpp index 0c4e6ee..f3a8f85 100644 --- a/libbpf_android/BpfLoadTest.cpp +++ b/libbpf_android/BpfLoadTest.cpp @@ -17,6 +17,7 @@ #include <android-base/file.h> #include <android-base/macros.h> #include <gtest/gtest.h> +#include <libbpf.h> #include <stdlib.h> #include <unistd.h> #include <iostream> @@ -66,7 +67,7 @@ class BpfLoadTest : public TestWithParam<std::string> { EXPECT_EQ(android::bpf::loadProg(progPath.c_str(), &critical), 0); EXPECT_EQ(false, critical); - mProgFd = bpf_obj_get(mTpProgPath.c_str()); + mProgFd = retrieveProgram(mTpProgPath.c_str()); EXPECT_GT(mProgFd, 0); int ret = bpf_attach_tracepoint(mProgFd, "sched", "sched_switch"); @@ -103,34 +104,18 @@ class BpfLoadTest : public TestWithParam<std::string> { EXPECT_EQ(non_zero, 1); } - void checkMapBtf() { - // Earlier kernels lack BPF_BTF_LOAD support - if (!isAtLeastKernelVersion(4, 19, 0)) GTEST_SKIP() << "pre-4.19 kernel does not support BTF"; - - const bool haveBtf = GetParam().find("Btf") != std::string::npos; - - std::string str; - EXPECT_EQ(android::base::ReadFileToString(mTpMapPath, &str), haveBtf); - if (haveBtf) EXPECT_FALSE(str.empty()); - } - void checkKernelVersionEnforced() { - EXPECT_EQ(bpf_obj_get(mTpNeverLoadProgPath.c_str()), -1); + EXPECT_EQ(retrieveProgram(mTpNeverLoadProgPath.c_str()), -1); EXPECT_EQ(errno, ENOENT); } }; -INSTANTIATE_TEST_SUITE_P(BpfLoadTests, BpfLoadTest, - ::testing::Values("bpfLoadTpProg", "bpfLoadTpProgBtf")); +INSTANTIATE_TEST_SUITE_P(BpfLoadTests, BpfLoadTest, ::testing::Values("bpfLoadTpProg")); TEST_P(BpfLoadTest, bpfCheckMap) { checkMapNonZero(); } -TEST_P(BpfLoadTest, bpfCheckBtf) { - checkMapBtf(); -} - TEST_P(BpfLoadTest, bpfCheckMinKernelVersionEnforced) { checkKernelVersionEnforced(); } |