Fixed rebasing errors

Author: Mohammad Azim Khan

tools/build_api.py

@@ -314,12 +314,12 @@ def prepare_toolchain(src_paths, target, toolchain_name,
     try:
         if toolchain_name == "GCC_ARM":
             toolchain = TOOLCHAIN_CLASSES[toolchain_name](
-                target, options, notify, macros, silent,
+                target, notify, macros, silent,
                 extra_verbose=extra_verbose, build_profile=build_profile,
                 coverage_filter=coverage_filter)
         else:
             toolchain = TOOLCHAIN_CLASSES[toolchain_name](
-                target, options, notify, macros, silent,
+                target, notify, macros, silent,
                 extra_verbose=extra_verbose, build_profile=build_profile,
                 coverage_filter=coverage_filter)
     except KeyError:

tools/test_api.py

@@ -18,7 +18,6 @@
 """
 
 import os
-import re
 import sys
 import json
 import uuid
@@ -2150,7 +2149,6 @@ def build_tests(tests, base_source_paths, build_path, target, toolchain_name,
         bin_file = None
         test_case_folder_name = os.path.basename(test_path)
 
-<<<<<<< 205a97083e8ff9c0fdf55d0221675efacf6e0a88
         args = (src_path, test_build_path, target, toolchain_name)
         kwargs = {
             'jobs': jobs,
@@ -2165,7 +2163,7 @@ def build_tests(tests, base_source_paths, build_path, target, toolchain_name,
             'build_profile': build_profile,
             'silent': True,
             # Coverage requires main(). So if enabled on any module, enable it on test as well.
-            'coverage_filter': ".*" if coverage_filter else [])
+            'coverage_filter': ".*" if coverage_filter else []
         }
 
         results.append(p.apply_async(build_test_worker, args, kwargs))