Merge branch 'master' into add_cypress_kits

Author: bridadan

packages/mbed-greentea/mbed_greentea/mbed_greentea_cli.py

@@ -78,8 +78,6 @@
     run_test_thread,
 )
 
-RET_NO_DEVICES = 1001
-RET_YOTTA_BUILD_FAIL = -1
 LOCAL_HOST_TESTS_DIR = './test/host_tests'  # Used by mbedhtrun -e <dir>
 
 
@@ -339,7 +337,7 @@ def main():
             except KeyboardInterrupt:
                 greentea_clean_kettle(gt_instance_uuid)
                 gt_logger.gt_log_err("ctrl+c keyboard interrupt!")
-                return(-2)    # Keyboard interrupt
+                return 1    # Keyboard interrupt
             except:
                 greentea_clean_kettle(gt_instance_uuid)
                 gt_logger.gt_log_err("unexpected error:")
@@ -353,7 +351,7 @@ def main():
             cli_ret = main_cli(opts, args)
         except KeyboardInterrupt:
             gt_logger.gt_log_err("ctrl+c keyboard interrupt!")
-            return(-2)    # Keyboard interrupt
+            return 1    # Keyboard interrupt
         except Exception as e:
             gt_logger.gt_log_err("unexpected error:")
             gt_logger.gt_log_tab(str(e))
@@ -364,6 +362,8 @@ def main():
         gt_logger.gt_log("completed in %.2f sec"% delta)
 
     if cli_ret:
+        if cli_ret < 0 or cli_ret > 255:
+            cli_ret = 1
         gt_logger.gt_log_err("exited with code %d"% cli_ret)
 
     return(cli_ret)

packages/mbed-host-tests/mbed_host_tests/mbedhtrun.py

@@ -28,15 +28,18 @@ def main():
              2. Call default test execution function run() to start test instrumentation
     """
     freeze_support()
-    result = -2
+    result = 1
     test_selector = DefaultTestSelector(init_host_test_cli_params())
     try:
         result = test_selector.execute()
     except (KeyboardInterrupt, SystemExit):
         test_selector.finish()
-        result = -3
         raise
     else:
         test_selector.finish()
 
+    # Ensure we don't return a negative value
+    if result < 0 or result > 255:
+        result = 1
+
     return result

packages/mbed-ls/mbed_lstools/main.py

@@ -189,7 +189,7 @@ def mbedls_main():
 
     if mbeds is None:
         logger.critical('This platform is not supported! Pull requests welcome at github.com/ARMmbed/mbed-ls')
-        sys.exit(-1)
+        sys.exit(1)
 
     ret_code = args.command(mbeds, args)
     if not ret_code:

test/detect/mbed_htm.py

@@ -29,9 +29,7 @@ class ParseMbedHTMTestCase(unittest.TestCase):
 
     # DAPlink <0240
     test_mbed_htm_k64f_url_str = '<meta http-equiv="refresh" content="0; url=http://mbed.org/device/?code=02400203D94B0E7724B7F3CF"/>'
-    test_mbed_htm_l152re_url_str = '<meta http-equiv="refresh" content="0; url=http://mbed.org/device/?code=07100200656A9A955A0F0CB8"/>'
     test_mbed_htm_lpc1768_url_str = '<meta http-equiv="refresh" content="0; url=http://mbed.org/start?auth=101000000000000000000002F7F1869557200730298d254d3ff3509e3fe4722d&loader=11972&firmware=16457&configuration=4" />'
-    test_mbed_htm_nucleo_l031k6_str = '<meta http-equiv="refresh" content="0; url=http://mbed.org/device/?code=07900221461663077952F5AA"/>'
     test_mbed_htm_nrf51_url_str = '<meta http-equiv="refresh" content="0; url=http://mbed.org/device/?code=1100021952333120353935373130313232323032AFD5DFD8"/>'
 
     # DAPLink 0240
@@ -47,18 +45,10 @@ def test_mbed_htm_k64f_url(self):
         target_id = self.mbeds._target_id_from_htm(self.test_mbed_htm_k64f_url_str)
         self.assertEqual('02400203D94B0E7724B7F3CF', target_id)
 
-    def test_mbed_htm_l152re_url(self):
-        target_id = self.mbeds._target_id_from_htm(self.test_mbed_htm_l152re_url_str)
-        self.assertEqual('07100200656A9A955A0F0CB8', target_id)
-
     def test_mbed_htm_lpc1768_url(self):
         target_id = self.mbeds._target_id_from_htm(self.test_mbed_htm_lpc1768_url_str)
         self.assertEqual('101000000000000000000002F7F1869557200730298d254d3ff3509e3fe4722d', target_id)
 
-    def test_daplink_nucleo_l031k6_url(self):
-        target_id = self.mbeds._target_id_from_htm(self.test_mbed_htm_nucleo_l031k6_str)
-        self.assertEqual('07900221461663077952F5AA', target_id)
-
     def test_daplink_240_mbed_html(self):
         target_id = self.mbeds._target_id_from_htm(self.test_daplink_240_mbed_html_str)
         self.assertEqual('0240000029164e45002f0012706e0006f301000097969900', target_id)
@@ -83,10 +73,6 @@ def get_mbed_htm_comment_section_ver_build(self):
         self.assertIsNotNone(ver_bld)
         self.assertEqual(('0200', 'Mar 26 2014 13:22:20'), ver_bld)
 
-        ver_bld = self.mbeds._mbed_htm_comment_section_ver_build('<!-- Version: 0200 Build: Aug 27 2014 13:29:28 -->')
-        self.assertIsNotNone(ver_bld)
-        self.assertEqual(('0200', 'Aug 27 2014 13:29:28'), ver_bld)
-
         ver_bld = self.mbeds._mbed_htm_comment_section_ver_build('<!-- Version: 0219 Build: Feb  2 2016 15:20:54 Git Commit SHA: 0853ba0cdeae2436c52efcba0ba76a6434c200ff Git local mods:No-->')
         self.assertIsNotNone(ver_bld)
         self.assertEqual(('0219', 'Feb  2 2016 15:20:54'), ver_bld)