commit 4f9730b51f234cbf930b556b3b707ca098154e1d
author android-build-prod (mdb) <android-build-team-robot@google.com> Fri Oct 30 20:04:02 2020 +0000
committer android-build-prod (mdb) <android-build-team-robot@google.com> Fri Oct 30 20:04:02 2020 +0000
tree 24bdeb41caba47d1f837750d8915b60b8d81eacd
parent c2d0acbf3ec3dd22154b5ed1bf353403ab282968
parent 4407735953d4f981931168f0136784e7ee99103f

Snap for 6941968 from 4407735953d4f981931168f0136784e7ee99103f to android11-tests-release

Change-Id: Iade6e39f5f8e45d74650dee60546ceb530f26e49

tests/bpf_base_test.cpp

diff --git a/tests/bpf_base_test.cpp b/tests/bpf_base_test.cpp
index f28c5f8..3d3da44 100644
--- a/tests/bpf_base_test.cpp
+++ b/tests/bpf_base_test.cpp
@@ -59,15 +59,7 @@
     SKIP_IF_BPF_NOT_SUPPORTED;
 
     std::string cg2_path;
-#if 0
-    // This is the correct way to fetch cg2_path, but it occasionally hits ASAN
-    // problems due to memory allocated in non ASAN code being freed later by us
     ASSERT_EQ(true, CgroupGetControllerPath(CGROUPV2_CONTROLLER_NAME, &cg2_path));
-#else
-    ASSERT_EQ(true, CgroupGetControllerPath(CGROUPV2_CONTROLLER_NAME, nullptr));
-    // Constant derived from //system/core/libprocessgroup/profiles/cgroups.json
-    cg2_path = "/dev/cg2_bpf";
-#endif
     ASSERT_EQ(0, access(cg2_path.c_str(), R_OK));
     ASSERT_EQ(0, access((cg2_path + "/cgroup.controllers").c_str(), R_OK));
 }