deparametrize BpfLoadTest am: fee8f17fe0
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/3204682
Change-Id: I6958c720add8dfb5f7d9486ff2280074f0dfa340
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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();
}