commit aaa954a6ae4ac042f41155df92aac2138871264a
author Adithya Srinivasan <adsrini@google.com> Wed Jan 20 19:21:03 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 20 19:21:03 2021 +0000
tree 570a00dfaeb1658cedde8f2917a9c48c62bdbcd9
parent e8773a2f03d92b684b2bd3690e9e2a8b6349fcbb
parent aaf1ba472a6e1d08251d9eddfbe90fbbbdd1372b

Merge changes I10c3bf8a,Ifaafdbfb,I9f570567 am: aaf1ba472a

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1554578

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I402a03007ea2a80af40d2b4f5f430718c2f1fa43

services/gpuservice/tests/unittests/GpuMemTracerTest.cpp

diff --git a/services/gpuservice/tests/unittests/GpuMemTracerTest.cpp b/services/gpuservice/tests/unittests/GpuMemTracerTest.cpp
index cd8e19c..d76f039 100644
--- a/services/gpuservice/tests/unittests/GpuMemTracerTest.cpp
+++ b/services/gpuservice/tests/unittests/GpuMemTracerTest.cpp
@@ -56,7 +56,6 @@
     }
 
     void SetUp() override {
-        SKIP_IF_BPF_NOT_SUPPORTED;
         bpf::setrlimitForTest();
 
         mGpuMem = std::make_shared<GpuMem>();
@@ -122,7 +121,6 @@
 }
 
 TEST_F(GpuMemTracerTest, traceInitialCountersAfterGpuMemInitialize) {
-    SKIP_IF_BPF_NOT_SUPPORTED;
     ASSERT_RESULT_OK(mTestMap.writeValue(TEST_GLOBAL_KEY, TEST_GLOBAL_VAL, BPF_ANY));
     ASSERT_RESULT_OK(mTestMap.writeValue(TEST_PROC_KEY_1, TEST_PROC_VAL_1, BPF_ANY));
     ASSERT_RESULT_OK(mTestMap.writeValue(TEST_PROC_KEY_2, TEST_PROC_VAL_2, BPF_ANY));