commit 67b4652b45fe91dcc2eec28701f008ad7b1be09a
author Maciej Żenczykowski <maze@google.com> Tue Sep 17 02:12:07 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Sep 17 02:12:07 2024 +0000
tree 41d7b99cb28c2b9e0cc392519af393f3de6620f4
parent 9011ee638f475ef169c7083852f1f40a0a053828
parent 2f338a88c702ea96002d7501eab2106d5afcac7f

BpfLoadTest: change some EXPECT's to ASSERT's am: f381ae9268 am: 2f338a88c7

Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/3270315

Change-Id: I88ae1b0496822be9153b05cc2991e09c52f149c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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);
     }
 };