From 6f41ad73d35efeb7cf6da0889380df9d6779c3f8 Mon Sep 17 00:00:00 2001
From: Horst Schirmeier <horst.schirmeier@tu-dortmund.de>
Date: Thu, 3 May 2018 15:24:52 +0200
Subject: [PATCH] util: MemoryMap test failure more verbose

Change-Id: Ie42e1983d8cc5658b7e88d59cdbe689e6aefe9f2
---
 src/core/util/MemoryMap.hpp             |  4 ++++
 src/core/util/testing/memorymap-test.cc | 24 ++++++++++++++++++------
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/core/util/MemoryMap.hpp b/src/core/util/MemoryMap.hpp
index 923e8446..5d15b8ec 100644
--- a/src/core/util/MemoryMap.hpp
+++ b/src/core/util/MemoryMap.hpp
@@ -99,6 +99,8 @@ public:
 	 * address2<tab>size2
 	 * ...
 	 * \endcode
+	 *
+	 * @return false if file could not be read
 	 */
 	bool readFromFile(char const * const filename);
 	/**
@@ -106,6 +108,8 @@ public:
 	 *
 	 * Currently all access size information is lost; the map is flattened out
 	 * to a long list of single-byte addresses.
+	 *
+	 * @return false if file could not be written
 	 */
 	bool writeToFile(char const * const filename);
 
diff --git a/src/core/util/testing/memorymap-test.cc b/src/core/util/testing/memorymap-test.cc
index bdea091c..627ae105 100644
--- a/src/core/util/testing/memorymap-test.cc
+++ b/src/core/util/testing/memorymap-test.cc
@@ -109,27 +109,39 @@ int main()
 	
 	test(mm);
 
-	mm.writeToFile(filename_tmp);
+	if (!mm.writeToFile(filename_tmp)) {
+		test_failed("writing tmp file");
+	}
 	mm.clear();
-	mm.readFromFile(filename_tmp);
+	if (!mm.readFromFile(filename_tmp)) {
+		test_failed("reading tmp file");
+	}
 
 	mm.dump(cerr);
 
 	test(mm);
 
 	// intentionally omitting mm.clear() here
-	mm.readFromFile(filename_test1);
+	if (!mm.readFromFile(filename_test1)) {
+		test_failed(filename_test1);
+	}
 	test(mm);
 
 	mm.clear();
-	mm.readFromFile(filename_test1);
+	if (!mm.readFromFile(filename_test1)) {
+		test_failed(filename_test1);
+	}
 	test(mm);
 
 	mm.clear();
-	mm.readFromFile(filename_test2);
+	if (!mm.readFromFile(filename_test2)) {
+		test_failed(filename_test2);
+	}
 	test(mm);
 
 	mm.clear();
-	mm.readFromFile(filename_test3);
+	if (!mm.readFromFile(filename_test3)) {
+		test_failed(filename_test3);
+	}
 	test(mm);
 }