Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06be21fe authored by Adithya Srinivasan's avatar Adithya Srinivasan Committed by Automerger Merge Worker
Browse files

Merge changes I10c3bf8a,Ifaafdbfb,I9f570567 am: aaf1ba47 am: aaa954a6

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I11b91da3dd77269e00e37ef340a4c50adcb9c3cd
parents 991241ee aaa954a6
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ public:
    }

    void SetUp() override {
        SKIP_IF_BPF_NOT_SUPPORTED;
        bpf::setrlimitForTest();

        mGpuMem = std::make_shared<GpuMem>();
@@ -122,7 +121,6 @@ static constexpr uint32_t getGpuIdForPid(uint32_t pid) {
}

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