commit 26e9636806dfe41b01a6c6efae389ad9eaaaf602
author Hridya Valsaraju <hridya@google.com> Mon Sep 13 20:19:05 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Sep 13 20:19:05 2021 +0000
tree dc90c13c5c4325877eb2957c92fa30c9d64e2e80
parent eb9f1325e57f2d07d3b5afa1c9cdaa58721b2d94
parent 765c309109996d28ab2a29b4e4a1935c02e39b31

libion: Increase allocation size in large allocation test am: 765c309109

Original change: https://android-review.googlesource.com/c/platform/system/memory/libion/+/1825288

Change-Id: I0402a1468d1413a3692fed5b9a399f330ec703aa

tests/allocate_test.cpp

diff --git a/tests/allocate_test.cpp b/tests/allocate_test.cpp
index 5ed01bb..64ebaa5 100644
--- a/tests/allocate_test.cpp
+++ b/tests/allocate_test.cpp
@@ -16,6 +16,7 @@
 
 #include <sys/mman.h>
 #include <memory>
+#include <sys/sysinfo.h>
 
 #include <gtest/gtest.h>
 
@@ -90,12 +91,17 @@
 }
 
 TEST_F(Allocate, Large) {
+    struct sysinfo si;
+    ASSERT_TRUE(sysinfo(&si) != -1);
+
+    auto totalRamSize = si.totalram * si.mem_unit;
+
     for (const auto& heap : ion_heaps) {
         SCOPED_TRACE(::testing::Message()
                      << "heap:" << heap.name << ":" << heap.type << ":" << heap.heap_id);
         int fd;
         ASSERT_EQ(-ENOMEM,
-                  ion_alloc_fd(ionfd, 3UL * 1024 * 1024 * 1024, 0, (1 << heap.heap_id), 0, &fd));
+                  ion_alloc_fd(ionfd, totalRamSize, 0, (1 << heap.heap_id), 0, &fd));
     }
 }