commit dd0c5287b0d43abb8c7bf414df9977b0c7a37ace
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jun 17 22:36:41 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jun 17 22:36:41 2022 +0000
tree 532f6bd05515292787a6f40e8217b39212b99e1a
parent aa4f219dc990f45405ed162db5343477c1ac3f1f
parent e3f4cd71fe698b72f818c76fed76083bb768ec87

Merge "GpuMemTracerTest - switch mTestMap bpfmap init to move assignment" am: b69a669d59 am: b4bd6b5123 am: 4897a0c593 am: c213090021 am: e3f4cd71fe

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

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

services/gpuservice/tests/unittests/GpuMemTracerTest.cpp

diff --git a/services/gpuservice/tests/unittests/GpuMemTracerTest.cpp b/services/gpuservice/tests/unittests/GpuMemTracerTest.cpp
index d76f039..b7d2b86 100644
--- a/services/gpuservice/tests/unittests/GpuMemTracerTest.cpp
+++ b/services/gpuservice/tests/unittests/GpuMemTracerTest.cpp
@@ -64,11 +64,11 @@
         mTestableGpuMem = TestableGpuMem(mGpuMem.get());
 
         errno = 0;
-        mTestMap = bpf::BpfMap<uint64_t, uint64_t>(BPF_MAP_TYPE_HASH, TEST_MAP_SIZE,
-                                                   BPF_F_NO_PREALLOC);
+        mTestMap = std::move(bpf::BpfMap<uint64_t, uint64_t>(BPF_MAP_TYPE_HASH,
+                                                             TEST_MAP_SIZE,
+                                                             BPF_F_NO_PREALLOC));
 
         EXPECT_EQ(0, errno);
-        EXPECT_LE(0, mTestMap.getMap().get());
         EXPECT_TRUE(mTestMap.isValid());
     }