commit f381ae9268dded4981bd3e43a2831c5b234d9441
author Maciej Żenczykowski <maze@google.com> Tue Sep 17 00:03:56 2024 +0000
committer Maciej Żenczykowski <maze@google.com> Tue Sep 17 00:04:20 2024 +0000
tree 41d7b99cb28c2b9e0cc392519af393f3de6620f4
parent 19a5ec2f66016f8af4c12d3ee6e983ab48853662

BpfLoadTest: change some EXPECT's to ASSERT's

This should hopefully cause test failures to be clean test failures instead of hitting abort() and bringing down the entire test framework.

Test: TreeHugger
Bug: 366103938
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I26b78c904102e581e2d1e7b259a80dd0a6f3e50e

loader/BpfLoadTest.cpp

diff --git a/loader/BpfLoadTest.cpp b/loader/BpfLoadTest.cpp
index dd41bb5..4ec89be 100644
--- a/loader/BpfLoadTest.cpp
+++ b/loader/BpfLoadTest.cpp
@@ -73,11 +73,11 @@
         };
         EXPECT_EQ(android::bpf::loadProg(progPath.c_str(), &critical, loc), -1);
 
-        EXPECT_EQ(android::bpf::loadProg(progPath.c_str(), &critical), 0);
+        ASSERT_EQ(android::bpf::loadProg(progPath.c_str(), &critical), 0);
         EXPECT_EQ(false, critical);
 
         mProgFd = retrieveProgram(mTpProgPath.c_str());
-        EXPECT_GT(mProgFd, 0);
+        ASSERT_GT(mProgFd, 0);
 
         int ret = bpf_attach_tracepoint(mProgFd, "sched", "sched_switch");
         EXPECT_NE(ret, 0);
@@ -114,8 +114,8 @@
     }
 
     void checkKernelVersionEnforced() {
-        EXPECT_EQ(retrieveProgram(mTpNeverLoadProgPath.c_str()), -1);
-        EXPECT_EQ(errno, ENOENT);
+        ASSERT_EQ(retrieveProgram(mTpNeverLoadProgPath.c_str()), -1);
+        ASSERT_EQ(errno, ENOENT);
     }
 };