commit 0ea8ced69b9c9bfe0827e318318d295fc44c31c8
author Andrew Walbran <qwandor@google.com> Wed Oct 03 14:56:58 2018 +0100
committer Andrew Walbran <qwandor@google.com> Thu Oct 04 13:58:42 2018 +0100
tree f782d0e91ff0c48fa93effc086ba7ea4223b4017
parent b75bcd817216e87348420e6dc76f78645b464377

Use real mm with mock arch for FDT tests, rather than mock mm.

Change-Id: I8003442916118041591eb36c3c81eca777ed38ce

src/fdt_handler_test.cc

diff --git a/src/fdt_handler_test.cc b/src/fdt_handler_test.cc
index 0e039bb..ab0b349 100644
--- a/src/fdt_handler_test.cc
+++ b/src/fdt_handler_test.cc
@@ -1,13 +1,18 @@
 extern "C" {
 #include "hf/fdt_handler.h"
 
+#include "hf/alloc.h"
 #include "hf/boot_params.h"
 }
 
+#include <memory>
+
 #include <gmock/gmock.h>
 
 using ::testing::Eq;
 
+static constexpr size_t TEST_HEAP_SIZE = PAGE_SIZE * 10;
+
 /*
  * /dts-v1/;
  *
@@ -35,7 +40,7 @@
  * | xxd -i
  */
 
-static const uint8_t test_dtb[] = {
+static constexpr uint8_t test_dtb[] = {
 	0xd0, 0x0d, 0xfe, 0xed, 0x00, 0x00, 0x01, 0x7f, 0x00, 0x00, 0x00, 0x38,
 	0x00, 0x00, 0x01, 0x30, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x11,
 	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4f,
@@ -71,7 +76,11 @@
 
 TEST(fdt, get_boot_params)
 {
-	struct boot_params params;
+	std::unique_ptr<uint8_t[]> test_heap(new uint8_t[TEST_HEAP_SIZE]);
+	halloc_init((size_t)test_heap.get(), TEST_HEAP_SIZE);
+	ASSERT_TRUE(mm_init());
+
+	struct boot_params params = {};
 	EXPECT_TRUE(
 		fdt_get_boot_params(pa_init((uintpaddr_t)&test_dtb), &params));
 	EXPECT_THAT(params.mem_ranges_count, Eq(3));