Merge "Merge RP1A.191203.001" into r-keystone-qcom-dev

1 files changed, 0 insertions, 146 deletions

diff --git a/libion/tests/allocate_test.cpp b/libion/tests/allocate_test.cpp
deleted file mode 100644
index 5ed01bbf4..000000000
--- a/libion/tests/allocate_test.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <sys/mman.h>
-#include <memory>
-
-#include <gtest/gtest.h>
-
-#include <ion/ion.h>
-#include "ion_test_fixture.h"
-
-class Allocate : public IonTest {};
-
-TEST_F(Allocate, Allocate) {
-    static const size_t allocationSizes[] = {4 * 1024, 64 * 1024, 1024 * 1024, 2 * 1024 * 1024};
-    for (const auto& heap : ion_heaps) {
-        for (size_t size : allocationSizes) {
-            SCOPED_TRACE(::testing::Message()
-                         << "heap:" << heap.name << ":" << heap.type << ":" << heap.heap_id);
-            SCOPED_TRACE(::testing::Message() << "size " << size);
-            int fd;
-            ASSERT_EQ(0, ion_alloc_fd(ionfd, size, 0, (1 << heap.heap_id), 0, &fd));
-            ASSERT_TRUE(fd != 0);
-            ASSERT_EQ(close(fd), 0);  // free the buffer
-        }
-    }
-}
-
-TEST_F(Allocate, AllocateCached) {
-    static const size_t allocationSizes[] = {4 * 1024, 64 * 1024, 1024 * 1024, 2 * 1024 * 1024};
-    for (const auto& heap : ion_heaps) {
-        for (size_t size : allocationSizes) {
-            SCOPED_TRACE(::testing::Message()
-                         << "heap:" << heap.name << ":" << heap.type << ":" << heap.heap_id);
-            SCOPED_TRACE(::testing::Message() << "size " << size);
-            int fd;
-            ASSERT_EQ(0, ion_alloc_fd(ionfd, size, 0, (1 << heap.heap_id), ION_FLAG_CACHED, &fd));
-            ASSERT_TRUE(fd != 0);
-            ASSERT_EQ(close(fd), 0);  // free the buffer
-        }
-    }
-}
-
-TEST_F(Allocate, AllocateCachedNeedsSync) {
-    static const size_t allocationSizes[] = {4 * 1024, 64 * 1024, 1024 * 1024, 2 * 1024 * 1024};
-    for (const auto& heap : ion_heaps) {
-        for (size_t size : allocationSizes) {
-            SCOPED_TRACE(::testing::Message()
-                         << "heap:" << heap.name << ":" << heap.type << ":" << heap.heap_id);
-            SCOPED_TRACE(::testing::Message() << "size " << size);
-            int fd;
-            ASSERT_EQ(0, ion_alloc_fd(ionfd, size, 0, (1 << heap.heap_id),
-                                      ION_FLAG_CACHED_NEEDS_SYNC, &fd));
-            ASSERT_TRUE(fd != 0);
-            ASSERT_EQ(close(fd), 0);  // free the buffer
-        }
-    }
-}
-
-TEST_F(Allocate, RepeatedAllocate) {
-    static const size_t allocationSizes[] = {4 * 1024, 64 * 1024, 1024 * 1024, 2 * 1024 * 1024};
-    for (const auto& heap : ion_heaps) {
-        for (size_t size : allocationSizes) {
-            SCOPED_TRACE(::testing::Message()
-                         << "heap:" << heap.name << ":" << heap.type << ":" << heap.heap_id);
-            SCOPED_TRACE(::testing::Message() << "size " << size);
-            int fd;
-
-            for (unsigned int i = 0; i < 1024; i++) {
-                SCOPED_TRACE(::testing::Message() << "iteration " << i);
-                ASSERT_EQ(0, ion_alloc_fd(ionfd, size, 0, (1 << heap.heap_id), 0, &fd));
-                ASSERT_TRUE(fd != 0);
-                ASSERT_EQ(close(fd), 0);  // free the buffer
-            }
-        }
-    }
-}
-
-TEST_F(Allocate, Large) {
-    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));
-    }
-}
-
-// Make sure all heaps always return zeroed pages
-TEST_F(Allocate, Zeroed) {
-    auto zeroes_ptr = std::make_unique<char[]>(4096);
-
-    for (const auto& heap : ion_heaps) {
-        SCOPED_TRACE(::testing::Message()
-                     << "heap:" << heap.name << ":" << heap.type << ":" << heap.heap_id);
-        int fds[16];
-        for (unsigned int i = 0; i < 16; i++) {
-            int map_fd = -1;
-
-            ASSERT_EQ(0, ion_alloc_fd(ionfd, 4096, 0, (1 << heap.heap_id), 0, &map_fd));
-            ASSERT_GE(map_fd, 0);
-
-            void* ptr = NULL;
-            ptr = mmap(NULL, 4096, PROT_WRITE, MAP_SHARED, map_fd, 0);
-            ASSERT_TRUE(ptr != NULL);
-
-            memset(ptr, 0xaa, 4096);
-
-            ASSERT_EQ(0, munmap(ptr, 4096));
-            fds[i] = map_fd;
-        }
-
-        for (unsigned int i = 0; i < 16; i++) {
-            ASSERT_EQ(0, close(fds[i]));
-        }
-
-        int new_ionfd = ion_open();
-        int map_fd = -1;
-
-        ASSERT_EQ(0, ion_alloc_fd(new_ionfd, 4096, 0, (1 << heap.heap_id), 0, &map_fd));
-        ASSERT_GE(map_fd, 0);
-
-        void* ptr = NULL;
-        ptr = mmap(NULL, 4096, PROT_READ, MAP_SHARED, map_fd, 0);
-        ASSERT_TRUE(ptr != NULL);
-
-        ASSERT_EQ(0, memcmp(ptr, zeroes_ptr.get(), 4096));
-
-        ASSERT_EQ(0, munmap(ptr, 4096));
-        ASSERT_EQ(0, close(map_fd));
-        ASSERT_EQ(0, ion_close(new_ionfd));
-    }
-}