commit b1a2f7d20ff6b265d3163e1d85ffdb5a0643dbce
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Sep 17 23:25:55 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Sep 17 23:25:55 2024 +0000
tree 41d7b99cb28c2b9e0cc392519af393f3de6620f4
parent 79c70c3f3f707356019f9f75e6b1f0b5641385b8
parent 67b4652b45fe91dcc2eec28701f008ad7b1be09a

Snap for 12378824 from 67b4652b45fe91dcc2eec28701f008ad7b1be09a to 24Q4-release

Change-Id: Ic1f1626e3f7aec5bf7a2c9c486b6ddce87f04066

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