Merge pull request #304 from autopulated/master

fix #303 - still try to run tests if the build status is nonzero

Author: autopulated

yotta/build.py

@@ -38,23 +38,34 @@ def addOptions(parser, add_build_targets=True):
         )
 
 def execCommand(args, following_args):
+    status = installAndBuild(args, following_args)
+    return status['status']
+
+def installAndBuild(args, following_args):
+    ''' Perform the build command, but provide detailed error information.
+        Returns {status:0, build_status:0, generate_status:0, install_status:0} on success.
+        If status: is nonzero there was some sort of error. Other properties
+        are optional, and may not be set if that step was not attempted.
+    '''
+    build_status = generate_status = install_status = 0
+
     if not hasattr(args, 'build_targets'):
         vars(args)['build_targets'] = []
 
     if 'test' in args.build_targets:
         logging.error('Cannot build "test". Use "yotta test" to run tests.')
-        return 1
+        return {'status':1}
 
     cwd = os.getcwd()
     c = validate.currentDirectoryModule()
     if not c:
-        return 1
+        return {'status':1}
 
     target, errors = c.satisfyTarget(args.target)
     if errors:
         for error in errors:
             logging.error(error)
-        return 1
+        return {'status':1}
 
     # run the install command before building, we need to add some options the
     # install command expects to be present to do this:
@@ -77,7 +88,7 @@ def execCommand(args, following_args):
 
     # install may exit non-zero for non-fatal errors (such as incompatible
     # version specs), which it will display
-    errcode = install.execCommand(args, [])
+    install_status = install.execCommand(args, [])
 
     builddir = os.path.join(cwd, 'build', target.getName())
 
@@ -95,12 +106,12 @@ def execCommand(args, following_args):
             missing += 1
     if missing:
         logging.error('Missing dependencies prevent build. Use `yotta ls` to list them.')
-        return 1
+        return {'status': 1, 'install_status':install_status, 'missing_status':missing}
 
     generator = cmakegen.CMakeGen(builddir, target)
     for error in generator.generateRecursive(c, all_components, builddir):
         logging.error(error)
-        errcode = 1
+        generate_status = 1
 
     if (not hasattr(args, 'generate_only')) or (not args.generate_only):
         error = target.build(
@@ -109,7 +120,14 @@ def execCommand(args, following_args):
         )
         if error:
             logging.error(error)
-            errcode = 1
-
+            build_status = 1
+    
+    return {
+                'status': build_status or generate_status or install_status,
+        'missing_status': missing,
+          'build_status': build_status,
+       'generate_status': generate_status,
+        'install_status': install_status
+    }
     return errcode
 

yotta/test_subcommand.py

@@ -93,16 +93,23 @@ def execCommand(args, following_args):
     if all_tests:
         args.tests.remove('all')
 
+    returncode = 0
     if args.build and not args.list_only:
         # we need to build before testing, make sure that any tests needed are
         # built:
         if all_tests:
             vars(args)['build_targets'] = args.tests + ['all_tests']
         else:
             vars(args)['build_targets'] = args.tests
-        status = build.execCommand(args, following_args)
-        if status:
-            return status
+        build_status = build.installAndBuild(args, following_args)
+        # a generate or build step failure is fatal, but an install-step
+        # failure should not prevent attempting tests:
+        if build_status.get('generate_status', 0) != 0 or \
+           build_status.get('build_status', 0) != 0 or \
+           build_status.get('missing_status', 0) != 0:
+            return 1
+        else:
+            returncode = build_status['status']
 
     cwd = os.getcwd()
 
@@ -132,7 +139,6 @@ def execCommand(args, following_args):
     # tests, in case the specific test does not belong to this module
     tests = findCTests(builddir, recurse_yotta_modules=(all_tests or len(args.tests)))
 
-    returncode = 0
     passed = 0
     failed = 0
     for dirname, test_exes in tests:
@@ -152,15 +158,17 @@ def execCommand(args, following_args):
             logging.info('test %s: %s', module.getName(), test)
             if args.list_only:
                 continue
-            returncode = target.test(
+            test_returncode = target.test(
                        builddir = dirname, 
                         program = test,
                  filter_command = filter_command,
                    forward_args = following_args
             )
-            if returncode:
+            if test_returncode:
                 logging.error('test %s failed', test)
                 failed += 1
+                if not returncode:
+                    returncode = 1
             else:
                 logging.info('test %s passed', test)
                 passed += 1