commit aa4f219dc990f45405ed162db5343477c1ac3f1f
author Maciej Żenczykowski <maze@google.com> Fri Jun 17 22:31:09 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jun 17 22:31:09 2022 +0000
tree ad311a9a08a49111a877458d1a743ebbc0deb2bb
parent 7a95fa7fcb86236310630b0f5e3493228726a11f
parent 12d6aea180376ded88dab2faa7d15897c8cdb2f8

Merge "GpuMemTest - switch mTestMap bpfmap init to move assignment" am: 02983cc9b8 am: 824771b88e am: 0684601024 am: c275c9724f am: 12d6aea180

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

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

services/gpuservice/tests/unittests/GpuMemTest.cpp

diff --git a/services/gpuservice/tests/unittests/GpuMemTest.cpp b/services/gpuservice/tests/unittests/GpuMemTest.cpp
index e916221..2c19c24 100644
--- a/services/gpuservice/tests/unittests/GpuMemTest.cpp
+++ b/services/gpuservice/tests/unittests/GpuMemTest.cpp
@@ -65,11 +65,11 @@
         mTestableGpuMem = TestableGpuMem(mGpuMem.get());
         mTestableGpuMem.setInitialized();
         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());
     }