Added calls to targets.json to check supported toolchains. Skips unsupported toolchains per target.

Author: sarahmarshy

tools/export/__init__.py

@@ -70,7 +70,9 @@ def export(project_path, project_name, ide, target, destination='/tmp/',
     use_progen = False
 
     supported = True
-    report = {'success': False, 'errormsg':''}
+    report = {'success': False, 'errormsg':'', 'skip': False}
+
+
 
     if ide is None or ide == "zip":
         # Simple ZIP exporter
@@ -85,6 +87,7 @@ def export(project_path, project_name, ide, target, destination='/tmp/',
     else:
         if ide not in EXPORTERS:
             report['errormsg'] = ERROR_MESSAGE_UNSUPPORTED_TOOLCHAIN % (target, ide)
+            report['skip'] = True
         else:
             Exporter = EXPORTERS[ide]
             target = EXPORT_MAP.get(target, target)
@@ -93,12 +96,13 @@ def export(project_path, project_name, ide, target, destination='/tmp/',
                     use_progen = True
             except AttributeError:
                 pass
+
+            if target not in Exporter.TARGETS or ide.upper() not in TARGET_MAP[target].supported_toolchains:
+                supported = False
+
             if use_progen:
                 if not ProGenDef(ide).is_supported(TARGET_MAP[target].progen['target']):
                     supported = False
-            else:
-                if target not in Exporter.TARGETS:
-                    supported = False
 
             if supported:
                 # target checked, export
@@ -120,6 +124,7 @@ def export(project_path, project_name, ide, target, destination='/tmp/',
 
             else:
                 report['errormsg'] = ERROR_MESSAGE_UNSUPPORTED_TOOLCHAIN % (target, ide)
+                report['skip'] = True
 
     zip_path = None
     if report['success']:

tools/project_api.py

@@ -84,7 +84,7 @@ def perform_export(dir, name, ide, mcu, temp, clean=False, zip=False, lib_symbol
     return tmp_path, report
 
 
-def print_results(successes, failures):
+def print_results(successes, failures, skips = []):
     print
     if len(successes) > 0:
         print "Successful: "
@@ -94,4 +94,8 @@ def print_results(successes, failures):
         print "Failed: "
         for failure in failures:
             print "  * %s" % failure
+    if len(skips) > 0:
+        print "Skipped: "
+        for skip in skips:
+            print "  * %s" % skip
 

tools/test/export/build_test.py

@@ -70,7 +70,7 @@ def handle_project_files(tool, project_dir, target, test, clean=False):
             with open(log, 'r') as f:
                 print f.read()
         except:
-            print("No log file found")
+            return
 
         test_prefix = "_".join([test, target, tool])
         log_name = os.path.join(new_dir,test_prefix+"_log.txt")
@@ -96,6 +96,7 @@ def generate_and_build(self, tests, clean=False):
         #build results
         successes = []
         failures = []
+        skips = []
         for mcu, ides in self.target_ides.items():
             for test in tests:
                 #resolve name alias
@@ -107,11 +108,13 @@ def generate_and_build(self, tests, clean=False):
 
                     if report['success']:
                         successes.append("build for %s::%s\t%s" % (mcu, ide, project_name))
+                    elif report['skip']:
+                        skips.append("%s::%s\t%s" % (mcu, ide, project_name))
                     else:
                         failures.append("%s::%s\t%s for %s" % (mcu, ide, report['errormsg'], project_name))
 
                     ProgenBuildTest.handle_project_files(ide, project_temp, mcu, project_name, clean)
-        return successes, failures
+        return successes, failures, skips
 
 
 if __name__ == '__main__':
@@ -160,8 +163,8 @@ def generate_and_build(self, tests, clean=False):
         args_error(parser, "[ERROR] ide must be in %s" % ', '.join(accepted_ides))
 
     b = ProgenBuildTest(ides, tests, targets)
-    successes, failures = b.generate_and_build(tests, options.clean)
-    print_results(successes, failures)
+    successes, failures, skips = b.generate_and_build(tests, options.clean)
+    print_results(successes, failures, skips)
     sys.exit(len(failures))