commit fee8f17fe09a93113e10f9203af5c00de12029be
author Maciej Żenczykowski <maze@google.com> Fri Aug 02 10:34:20 2024 -0700
committer Maciej Żenczykowski <maze@google.com> Fri Aug 02 11:05:19 2024 -0700
tree 28fd5ef5eca717c593e63ed98c4b51da3c842a8c
parent 9b50c967a8252e66cecd6ff78bb1aa1e79ebd77a

deparametrize BpfLoadTest

as this is no longer needed, since everything now
runs with the default of 'btf: true' (with the exception
of the 2 mainline .o's still shipped to Android S)

Test: TreeHugger, atest libbpf_load_test
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I91bdfea5b13367ce00a29f942af504eeef8db9cc

loader/BpfLoadTest.cpp

diff --git a/loader/BpfLoadTest.cpp b/loader/BpfLoadTest.cpp
index e14aa7b..dd41bb5 100644
--- a/loader/BpfLoadTest.cpp
+++ b/loader/BpfLoadTest.cpp
@@ -25,12 +25,10 @@
 #include "bpf/BpfUtils.h"
 #include "include/libbpf_android.h"
 
-using ::testing::TestWithParam;
-
 namespace android {
 namespace bpf {
 
-class BpfLoadTest : public TestWithParam<std::string> {
+class BpfLoadTest : public ::testing::Test {
   protected:
     BpfLoadTest() {}
     int mProgFd;
@@ -51,16 +49,16 @@
          */
         if (!isAtLeastKernelVersion(5, 11, 0)) EXPECT_EQ(setrlimitForTest(), 0);
 
-        mTpProgPath = "/sys/fs/bpf/prog_" + GetParam() + "_tracepoint_sched_sched_switch";
+        mTpProgPath = "/sys/fs/bpf/prog_bpfLoadTpProg_tracepoint_sched_sched_switch";
         unlink(mTpProgPath.c_str());
 
-        mTpNeverLoadProgPath = "/sys/fs/bpf/prog_" + GetParam() + "_tracepoint_sched_sched_wakeup";
+        mTpNeverLoadProgPath = "/sys/fs/bpf/prog_bpfLoadTpProg_tracepoint_sched_sched_wakeup";
         unlink(mTpNeverLoadProgPath.c_str());
 
-        mTpMapPath = "/sys/fs/bpf/map_" + GetParam() + "_cpu_pid_map";
+        mTpMapPath = "/sys/fs/bpf/map_bpfLoadTpProg_cpu_pid_map";
         unlink(mTpMapPath.c_str());
 
-        auto progPath = android::base::GetExecutableDirectory() + "/" + GetParam() + ".o";
+        auto progPath = android::base::GetExecutableDirectory() + "/bpfLoadTpProg.o";
         bool critical = true;
 
         bpf_prog_type kAllowed[] = {
@@ -121,13 +119,11 @@
     }
 };
 
-INSTANTIATE_TEST_SUITE_P(BpfLoadTests, BpfLoadTest, ::testing::Values("bpfLoadTpProg"));
-
-TEST_P(BpfLoadTest, bpfCheckMap) {
+TEST_F(BpfLoadTest, bpfCheckMap) {
     checkMapNonZero();
 }
 
-TEST_P(BpfLoadTest, bpfCheckMinKernelVersionEnforced) {
+TEST_F(BpfLoadTest, bpfCheckMinKernelVersionEnforced) {
     checkKernelVersionEnforced();
 }