commit 92f083d367f5df8c4a0903d927a3db9770679936
author Maciej Żenczykowski <maze@google.com> Thu Jun 16 23:58:39 2022 +0000
committer Maciej Żenczykowski <maze@google.com> Fri Jun 17 00:00:19 2022 +0000
tree 73e5536205a38cab08a53182e80f5d7662738453
parent 099a4648fdf4f261f70ca63920d24ba963d652f8

GpuMemTracerTest - switch mTestMap bpfmap init to move assignment

also remove use of .getMap() which I want to remove as it exposes fds and can leak
(isValid check in the next line is equivalent)

Bug: 236285127
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I4a8a3b918f25501ab0ab4aa74ce5d2a629ece463

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