Changed --coverage-filter to accept a list of filter

Author: Mohammad Azim Khan

tools/build_api.py

@@ -280,7 +280,7 @@ def prepare_toolchain(src_paths, target, toolchain_name,
                       notify=None, silent=False, verbose=False,
                       extra_verbose=False, config=None,
                       app_config=None, build_profile=None,
-                      coverage_filter=None):
+                      coverage_filter=[]):
     """ Prepares resource related objects - toolchain, target, config
 
     Positional arguments:
@@ -371,7 +371,7 @@ def build_project(src_paths, build_path, target, toolchain_name,
                   macros=None, inc_dirs=None, jobs=1, silent=False,
                   report=None, properties=None, project_id=None,
                   project_description=None, extra_verbose=False, config=None,
-                  app_config=None, build_profile=None, coverage_filter=None):
+                  app_config=None, build_profile=None, coverage_filter=[]):
     """ Build a project. A project may be a test or a user program.
 
     Positional arguments:

tools/options.py

@@ -82,7 +82,7 @@ def get_default_options_parser(add_clean=True, add_options=True,
         parser.add_argument("--app-config", default=None, dest="app_config",
                             type=argparse_filestring_type,
                             help="Path of an app configuration file (Default is to look for 'mbed_app.json')")
-    parser.add_argument("--coverage-filter", default=None, dest="coverage_filter",
+    parser.add_argument("--coverage-filter", default=[], action="append", dest="coverage_filter",
                         help="Enable coverage on path that contains filter expression.")
 
     return parser

tools/test_api.py

@@ -2115,7 +2115,7 @@ def build_tests(tests, base_source_paths, build_path, target, toolchain_name,
                 clean=False, notify=None, verbose=False, jobs=1, macros=None,
                 silent=False, report=None, properties=None,
                 continue_on_build_fail=False, app_config=None,
-                build_profile=None, coverage_filter=None):
+                build_profile=None, coverage_filter=[]):
     """Given the data structure from 'find_tests' and the typical build parameters,
     build all the tests
 

tools/toolchains/gcc.py

@@ -20,6 +20,7 @@
 from tools.toolchains import mbedToolchain, TOOLCHAIN_PATHS
 from tools.hooks import hook_tool
 
+
 class GCC(mbedToolchain):
     LINKER_EXT = '.ld'
     LIBRARY_EXT = '.a'
@@ -34,7 +35,7 @@ class GCC(mbedToolchain):
 
     def __init__(self, target,  notify=None, macros=None,
                  silent=False, tool_path="", extra_verbose=False,
-                 build_profile=None, coverage_filter=None):
+                 build_profile=None, coverage_filter=[]):
         mbedToolchain.__init__(self, target, notify, macros, silent,
                                extra_verbose=extra_verbose,
                                build_profile=build_profile)
@@ -90,6 +91,10 @@ def __init__(self, target,  notify=None, macros=None,
 
         self.flags["common"] += self.cpu
 
+        if self.coverage_filter:
+            self.flags["common"].append("-g")
+            self.flags["common"].append("-O0")
+
         main_cc = join(tool_path, "arm-none-eabi-gcc")
         main_cppc = join(tool_path, "arm-none-eabi-g++")
         self.asm = [main_cc] + self.flags['asm'] + self.flags["common"]
@@ -185,7 +190,7 @@ def get_compile_options(self, defines, includes, for_asm=False):
     @hook_tool
     def assemble(self, source, object, includes):
         # Build assemble command
-        if self.coverage_filter and re.search(self.coverage_filter, source):
+        if self.check_if_coverage_enabled(source):
             cmd = self.asm + self.COVERAGE_COMPILE_FLAGS + self.get_compile_options(self.get_symbols(True), includes) + ["-o", object, source]
         else:
             cmd = self.asm + self.get_compile_options(self.get_symbols(True), includes) + ["-o", object, source]
@@ -199,7 +204,7 @@ def assemble(self, source, object, includes):
     @hook_tool
     def compile(self, cc, source, object, includes):
         # Build compile command
-        if self.coverage_filter and re.search(self.coverage_filter, source):
+        if self.check_if_coverage_enabled(source):
             cmd = cc + self.COVERAGE_COMPILE_FLAGS + self.get_compile_options(self.get_symbols(), includes)
         else:
             cmd = cc + self.get_compile_options(self.get_symbols(), includes)
@@ -276,6 +281,18 @@ def binary(self, resources, elf, bin):
         self.cc_verbose("FromELF: %s" % ' '.join(cmd))
         self.default_cmd(cmd)
 
+    def check_if_coverage_enabled(self, src_path):
+        """
+        Checks if coverage is enabled on the source path.
+
+        :param src_path:
+        :return:
+        """
+        for exp in self.coverage_filter:
+            if re.search(exp, src_path):
+                return True
+        return False
+
 
 class GCC_ARM(GCC):
     @staticmethod
@@ -286,7 +303,7 @@ def check_executable():
         return mbedToolchain.generic_check_executable("GCC_ARM", 'arm-none-eabi-gcc', 1)
 
     def __init__(self, target, notify=None, macros=None,
-                 silent=False, extra_verbose=False, build_profile=None, coverage_filter=None):
+                 silent=False, extra_verbose=False, build_profile=None, coverage_filter=[]):
         GCC.__init__(self, target, notify, macros, silent,
                      TOOLCHAIN_PATHS['GCC_ARM'], extra_verbose=extra_verbose,
                      build_profile=build_profile, coverage_filter=coverage_filter)