test.py now requires -m and -t options

Author: bridadan

tools/test.py

@@ -31,7 +31,7 @@
 from tools.build_api import build_project, build_library
 from tools.build_api import print_build_memory_usage_results
 from tools.targets import TARGET_MAP
-from tools.utils import mkdir, ToolException, NotSupportedException
+from tools.utils import mkdir, ToolException, NotSupportedException, args_error
 from tools.test_exporters import ReportExporter, ResultExporterType
 from utils import argparse_filestring_type, argparse_lowercase_type, argparse_many
 from tools.toolchains import mbedToolchain
@@ -95,6 +95,16 @@
 
         options = parser.parse_args()
 
+        if not options.mcu:
+            args_error(parser, "[ERROR] You should specify an MCU")
+
+        mcu = options.mcu[0]
+
+        if not options.tool:
+            args_error(parser, "[ERROR] You should specify a TOOLCHAIN")
+
+        toolchain = options.tool[0]
+
         # Filter tests by path if specified
         if options.paths:
             all_paths = options.paths
@@ -106,8 +116,8 @@
 
         # Find all tests in the relevant paths
         for path in all_paths:
-            all_tests.update(find_tests(path, options.mcu, options.tool, options.options))
-            
+            all_tests.update(find_tests(path, mcu, toolchain, options.options))
+
         # Filter tests by name if specified
         if options.names:
             all_names = options.names
@@ -150,16 +160,13 @@
             if not base_source_paths:
                 base_source_paths = ['.']
 
-            
-            target = options.mcu[0]
-            
             build_report = {}
             build_properties = {}
 
             library_build_success = False
             try:
                 # Build sources
-                build_library(base_source_paths, options.build_dir, target, options.tool[0],
+                build_library(base_source_paths, options.build_dir, mcu, toolchain,
                                                 options=options.options,
                                                 jobs=options.jobs,
                                                 clean=options.clean,
@@ -186,7 +193,7 @@
                 print "Failed to build library"
             else:
                 # Build all the tests
-                test_build_success, test_build = build_tests(tests, [options.build_dir], options.build_dir, target, options.tool[0],
+                test_build_success, test_build = build_tests(tests, [options.build_dir], options.build_dir, mcu, toolchain,
                         options=options.options,
                         clean=options.clean,
                         report=build_report,

tools/test_api.py

@@ -1974,7 +1974,6 @@ def get_default_test_options_parser():
                         help='Prints script version and exits')
     return parser
 
-
 def test_path_to_name(path):
     """Change all slashes in a path into hyphens
     This creates a unique cross-platform test name based on the path