Test the module_add function

Author: theotherjimmy

tools/memap.py

@@ -27,7 +27,7 @@
 RE_OBJECT_LIBRARY_IAR = re.compile(r'^\s+(.+\.o)\s.*')
 
 RE_OBJECT_FILE_GCC = re.compile(r'^(.+\/.+\.o)$')
-RE_LIBRARY_OBJECT_GCC = re.compile(r'^.+\/(lib.+\.a)\((.+\.o)\)$')
+RE_LIBRARY_OBJECT_GCC = re.compile(r'^.+\/lib(.+\.a)\((.+\.o)\)$')
 RE_STD_SECTION_GCC = re.compile(r'^\s+.*0x(\w{8,16})\s+0x(\w+)\s(.+)$')
 RE_FILL_SECTION_GCC = re.compile(r'^\s*\*fill\*\s+0x(\w{8,16})\s+0x(\w+).*$')
 
@@ -219,14 +219,25 @@ def parse_map_file_gcc(self, file_desc):
                 next_section = self.check_new_section_gcc(line)
 
                 if next_section == "OUTPUT":
-                    return
+                    break
                 elif next_section:
                     current_section = next_section
 
                 object_name, object_size = self.parse_section_gcc(line, prefixes)
 
                 self.module_add(object_name, object_size, current_section)
 
+        common_prefix = os.path.dirname(os.path.commonprefix([
+            o for o in self.modules.keys() if (o.endswith(".o") and not o.startswith("[lib]"))]))
+        new_modules = {}
+        for name, stats in self.modules.items():
+            if name.startswith("[lib]"):
+                new_modules[name] = stats
+            elif name.endswith(".o"):
+                new_modules[os.path.relpath(name, common_prefix)] = stats
+            else:
+                new_modules[name] = stats
+        self.modules = new_modules
 
     def parse_object_name_armcc(self, line):
         """ Parse object file

tools/test/memap/parse_test.py

@@ -39,3 +39,23 @@ def test_parse_gcc():
     memap = MemapParser()
     memap.parse_map_file_gcc(open(join(dirname(__file__), "gcc.map")))
     assert memap.modules == PARSED_IAR_GCC_DATA
+
+
+def test_add_empty_module():
+    memap = MemapParser()
+    old_modules = deepcopy(memap.modules)
+    memap.module_add("", 8, ".data")
+    assert(old_modules == memap.modules)
+    memap.module_add("main.o", 0, ".text")
+    assert(old_modules == memap.modules)
+    memap.module_add("main.o", 8, "")
+    assert(old_modules == memap.modules)
+
+def test_add_full_module():
+    memap = MemapParser()
+    old_modules = deepcopy(memap.modules)
+    memap.module_add("main.o", 8, ".data")
+    assert(old_modules != memap.modules)
+    assert("main.o" in memap.modules)
+    assert(".data" in memap.modules["main.o"])
+    assert(memap.modules["main.o"][".data"] == 8)