Test moved to tools/test/export. Kwaargs eliminated. Build message

Author: sarahmarshy

tools/export/__init__.py

@@ -59,7 +59,7 @@ def online_build_url_resolver(url):
 
 def export(project_path, project_name, ide, target, destination='/tmp/',
            tempdir=None, pgen_build = False, clean=True, extra_symbols=None, make_zip=True, sources_relative=False,
-           build_url_resolver=online_build_url_resolver, **kwargs):
+           build_url_resolver=online_build_url_resolver, progen_build=False):
     # Convention: we are using capitals for toolchain and target names
     if target is not None:
         target = target.upper()
@@ -68,9 +68,6 @@ def export(project_path, project_name, ide, target, destination='/tmp/',
         tempdir = tempfile.mkdtemp()
 
     use_progen = False
-    build = False
-    if 'progen_build' in kwargs and kwargs.get('progen_build') == True:
-        build = True
 
     supported = True
     report = {'success': False, 'errormsg':''}
@@ -108,7 +105,7 @@ def export(project_path, project_name, ide, target, destination='/tmp/',
                 try:
                     exporter = Exporter(target, tempdir, project_name, build_url_resolver, extra_symbols=extra_symbols, sources_relative=sources_relative)
                     exporter.scan_and_copy_resources(project_path, tempdir, sources_relative)
-                    if build:
+                    if progen_build:
                         #try to build with pgen ide builders
                         try:
                             exporter.generate(progen_build=True)

tools/export/exporters.py

@@ -109,7 +109,7 @@ def progen_get_project_data(self):
         }
         return project_data
 
-    def progen_gen_file(self, tool_name, project_data, pgen_build = False):
+    def progen_gen_file(self, tool_name, project_data, pgen_build=False):
         """" Generate project using ProGen Project API """
         settings = ProjectSettings()
         project = Project(self.program_name, [project_data], settings)
@@ -118,6 +118,7 @@ def progen_gen_file(self, tool_name, project_data, pgen_build = False):
         project.project['common']['include_paths'] = self.resources.inc_dirs
         project.generate(tool_name, copied=not self.sources_relative)
         if pgen_build:
+            print("Project exported, building...")
             result = project.build(tool_name)
             if result == -1:
                 raise FailedBuildException("Build Failed")

tools/export/iar.py

@@ -46,7 +46,7 @@ class IAREmbeddedWorkbench(Exporter):
             # target is not supported yet
             continue
 
-    def generate(self, **kwargs):
+    def generate(self, progen_build=False):
         """ Generates the project files """
         project_data = self.progen_get_project_data()
         tool_specific = {}
@@ -75,7 +75,7 @@ def generate(self, **kwargs):
         # VLA is enabled via template IccAllowVLA
         project_data['tool_specific']['iar']['misc']['c_flags'].remove("--vla")
         project_data['common']['build_dir'] = os.path.join(project_data['common']['build_dir'], 'iar_arm')
-        if 'progen_build' in kwargs and kwargs.get('progen_build') == True:
+        if progen_build:
             self.progen_gen_file('iar_arm', project_data, True)
         else:
             self.progen_gen_file('iar_arm', project_data)

tools/export/uvision4.py

@@ -50,7 +50,7 @@ class Uvision4(Exporter):
     def get_toolchain(self):
         return TARGET_MAP[self.target].default_toolchain
 
-    def generate(self, **kwargs):
+    def generate(self, progen_build=False):
         """ Generates the project files """
         project_data = self.progen_get_project_data()
         tool_specific = {}
@@ -96,7 +96,7 @@ def generate(self, **kwargs):
             i += 1
         project_data['common']['macros'].append('__ASSERT_MSG')
         project_data['common']['build_dir'] = join(project_data['common']['build_dir'], 'uvision4')
-        if 'progen_build' in kwargs and kwargs.get('progen_build') == True:
+        if progen_build:
             self.progen_gen_file('uvision', project_data, True)
         else:
             self.progen_gen_file('uvision', project_data)

tools/export/uvision5.py

@@ -50,7 +50,7 @@ class Uvision5(Exporter):
     def get_toolchain(self):
         return TARGET_MAP[self.target].default_toolchain
 
-    def generate(self, **kwargs):
+    def generate(self, progen_build=False):
         """ Generates the project files """
         project_data = self.progen_get_project_data()
         tool_specific = {}
@@ -94,8 +94,8 @@ def generate(self, **kwargs):
             if macro.startswith('MBED_USERNAME'):
                 project_data['common']['macros'].pop(i)
             i += 1
-        project_data['common']['macros'].append('__ASSERT_MSG')
-        if 'progen_build' in kwargs and kwargs.get('progen_build') == True:
+
+        if progen_build:
             self.progen_gen_file('uvision5', project_data, True)
         else:
             self.progen_gen_file('uvision5', project_data)

tools/project_api.py

@@ -39,7 +39,7 @@ def get_test_from_name(n):
     return get_program(n)
 
 
-def setup_project(mcu, ide, program = None, source_dir= None, macros = None, build = None):
+def setup_project(mcu, ide, program=None, source_dir=None, macros=None, build=None):
 
     # Some libraries have extra macros (called by exporter symbols) to we need to pass
     # them to maintain compilation macros integrity between compiled library and
@@ -75,12 +75,12 @@ def setup_project(mcu, ide, program = None, source_dir= None, macros = None, bui
     return project_dir, project_name, project_temp
 
 
-def perform_export(dir, name, ide, mcu, temp, clean = True, zip = True, lib_symbols = '',
-                   sources_relative = False, progen_build = False):
+def perform_export(dir, name, ide, mcu, temp, clean=False, zip=False, lib_symbols='',
+                   sources_relative=False, progen_build=False):
 
     tmp_path, report = export(dir, name, ide, mcu, dir[0], temp, clean=clean,
                               make_zip=zip, extra_symbols=lib_symbols, sources_relative=sources_relative,
-                              progen_build = progen_build)
+                              progen_build=progen_build)
     return tmp_path, report
 
 

tools/build_test.py renamed to tools/test/export/build_test.py

@@ -1,17 +1,40 @@
+#!/usr/bin/env python
+"""
+mbed SDK
+Copyright (c) 2011-2013 ARM Limited
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
+
 import sys
+import argparse
+import os
+import shutil
 from os.path import join, abspath, dirname, exists, basename
-ROOT = abspath(join(dirname(__file__), ".."))
+r=dirname(__file__)
+ROOT = abspath(join(r, "..","..",".."))
+print ROOT
 sys.path.insert(0, ROOT)
 
-import argparse
-
-from export import EXPORTERS
-from targets import TARGET_NAMES, TARGET_MAP
-from project_api import setup_project, perform_export, print_results, get_test_from_name
+from tools.export import EXPORTERS
+from tools.targets import TARGET_NAMES, TARGET_MAP
+from tools.project_api import setup_project, perform_export, print_results, get_test_from_name
 from project_generator_definitions.definitions import ProGenDef
-from utils import args_error
+from tools.utils import args_error
 
-class BuildTest():
+
+class ProgenBuildTest():
     def __init__(self, desired_ides, tests, targets):
         #map of targets and the ides that can build programs for them
         self.target_ides = {}
@@ -38,7 +61,31 @@ def get_pgen_targets(ides):
                     targs.append(target)
         return targs
 
+    @staticmethod
+    def handle_build_log(tool, project_dir, target, test):
+        log = ''
+        new_dir = os.path.dirname(project_dir)
+        if tool == 'uvision' or tool == 'uvision5':
+            log = os.path.join(project_dir,"build","build_log.txt")
+        elif tool == 'iar':
+            log = os.path.join(project_dir, 'build_log.txt')
+        try:
+            with open(log, 'r') as f:
+                print f.read()
+        except:
+            print("No log file found")
+        log_name = "_".join([test, target, tool])+".txt"
+
+        os.rename(log, log_name)
+        #check if a log already exists for this platform+test+ide
+        if os.path.exists(os.path.join(new_dir,log_name)):
+            #delete it if so
+            os.remove(os.path.join(new_dir,log_name))
+        shutil.move(log_name, new_dir)
+        shutil.rmtree(project_dir, ignore_errors = True)
+
     def _generate_and_build(self, tests):
+
         #build results
         successes = []
         failures = []
@@ -50,25 +97,29 @@ def _generate_and_build(self, tests):
                     project_dir, project_name, project_temp = setup_project(mcu, ide, test)
                     tmp_path, report = perform_export(project_dir, project_name, ide, mcu, project_temp,
                                                       progen_build = True)
+
                     if report['success']:
                         successes.append("build for %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_build_log(ide, project_temp, mcu, project_name)
         return successes, failures
 
 
 if __name__ == '__main__':
     accepted_ides = ["iar", "uvision", "uvision5"]
-    accepted_targets = sorted(BuildTest.get_pgen_targets(accepted_ides))
+    accepted_targets = sorted(ProgenBuildTest.get_pgen_targets(accepted_ides))
     default_tests = ["MBED_BLINKY"]
+
     parser = argparse.ArgumentParser(description = "Test progen builders. Leave any flag off to run with all possible options.")
     parser.add_argument("-i", "--IDEs",
                       nargs = '+',
                       dest="ides",
                       help="tools you wish to perfrom build tests. (%s)" % ', '.join(accepted_ides),
                       default = accepted_ides)
 
-    parser.add_argument("-t", "--tests",
+    parser.add_argument("-n",
                     nargs='+',
                     dest="tests",
                     help="names of desired test programs",
@@ -95,6 +146,6 @@ def _generate_and_build(self, tests):
     if any(ide not in accepted_ides for ide in ides):
         args_error(parser, "[ERROR] ide must be in %s" % ', '.join(accepted_ides))
 
-    b = BuildTest(ides, tests, targets)
+    b = ProgenBuildTest(ides, tests, targets)