Use implementation from mbed-os-tools in greentea package

Author: bridadan

legacy/mbed-greentea/mbed_greentea/cmake_handlers.py

@@ -17,108 +17,9 @@
 Author: Przemyslaw Wirkus <[email protected]>
 """
 
-import re
-import os
-import os.path
-
-from mbed_greentea.mbed_greentea_log import gt_logger
-
-def load_ctest_testsuite(link_target, binary_type='.bin', verbose=False):
-    """! Loads CMake.CTest formatted data about tests from test directory
-    @return Dictionary of { test_case : test_case_path } pairs
-    """
-    result = {}
-    if link_target is not None:
-        ctest_path = os.path.join(link_target, 'test', 'CTestTestfile.cmake')
-        try:
-            with open(ctest_path) as ctest_file:
-                for line in ctest_file:
-                    line_parse = parse_ctesttestfile_line(link_target, binary_type, line, verbose=verbose)
-                    if line_parse:
-                        test_case, test_case_path = line_parse
-                        result[test_case] = test_case_path
-        except:
-            pass    # Return empty list if path is not found
-    return result
-
-def parse_ctesttestfile_line(link_target, binary_type, line, verbose=False):
-    """! Parse lines of CTestTestFile.cmake file and searches for 'add_test'
-    @return Dictionary of { test_case : test_case_path } pairs or None if failed to parse 'add_test' line
-    @details Example path with CTestTestFile.cmake:
-    c:/temp/xxx/mbed-sdk-private/build/frdm-k64f-gcc/test/
-
-    Example format of CTestTestFile.cmake:
-    # CMake generated Testfile for
-    # Source directory: c:/temp/xxx/mbed-sdk-private/build/frdm-k64f-gcc/test
-    # Build directory: c:/temp/xxx/mbed-sdk-private/build/frdm-k64f-gcc/test
-    #
-    # This file includes the relevant testing commands required for
-    # testing this directory and lists subdirectories to be tested as well.
-    add_test(mbed-test-stdio "mbed-test-stdio")
-    add_test(mbed-test-call_before_main "mbed-test-call_before_main")
-    add_test(mbed-test-dev_null "mbed-test-dev_null")
-    add_test(mbed-test-div "mbed-test-div")
-    add_test(mbed-test-echo "mbed-test-echo")
-    add_test(mbed-test-ticker "mbed-test-ticker")
-    add_test(mbed-test-hello "mbed-test-hello")
-    """
-    add_test_pattern = '[adtesADTES_]{8}\([\w\d_-]+ \"([\w\d_-]+)\"'
-    re_ptrn = re.compile(add_test_pattern)
-    if line.lower().startswith('add_test'):
-        m = re_ptrn.search(line)
-        if m and len(m.groups()) > 0:
-            if verbose:
-                print(m.group(1) + binary_type)
-            test_case = m.group(1)
-            test_case_path = os.path.join(link_target, 'test', m.group(1) + binary_type)
-            return test_case, test_case_path
-    return None
-
-def list_binaries_for_targets(build_dir='./build', verbose_footer=False):
-    """! Prints tests in target directories, only if tests exist.
-    @param build_dir Yotta default build directory where tests will be
-    @param verbose_footer Prints additional "how to use" Greentea footer
-    @details Skips empty / no tests for target directories.
-    """
-    dir = build_dir
-    sub_dirs = [os.path.join(dir, o) for o in os.listdir(dir) if os.path.isdir(os.path.join(dir, o))] \
-        if os.path.exists(dir) else []
-
-    def count_tests():
-        result = 0
-        for sub_dir in sub_dirs:
-            test_list = load_ctest_testsuite(sub_dir, binary_type='')
-            if len(test_list):
-                for test in test_list:
-                    result += 1
-        return result
-
-    if count_tests():
-        for sub_dir in sub_dirs:
-            target_name = sub_dir.split(os.sep)[-1]
-            gt_logger.gt_log("available tests for target '%s', location '%s'"% (target_name, os.path.abspath(os.path.join(build_dir, sub_dir))))
-            test_list = load_ctest_testsuite(sub_dir, binary_type='')
-            if len(test_list):
-                for test in sorted(test_list):
-                    gt_logger.gt_log_tab("test '%s'"% test)
-    else:
-        gt_logger.gt_log_warn("no tests found in current location")
-
-    if verbose_footer:
-        print
-        print("Example: execute 'mbedgt -t TARGET_NAME -n TEST_NAME' to run test TEST_NAME for target TARGET_NAME")
-
-def list_binaries_for_builds(test_spec, verbose_footer=False):
-    """! Parse test spec and list binaries (BOOTABLE) in lexicographical order
-    @param test_spec Test specification object
-    @param verbose_footer Prints additional "how to use" Greentea footer
-    """
-    test_builds = test_spec.get_test_builds()
-    for tb in test_builds:
-        gt_logger.gt_log("available tests for build '%s', location '%s'"% (tb.get_name(), tb.get_path()))
-        for tc in sorted(tb.get_tests().keys()):
-            gt_logger.gt_log_tab("test '%s'"% tc)
-
-    if verbose_footer:
-        print
-        print("Example: execute 'mbedgt -t BUILD_NAME -n TEST_NAME' to run test TEST_NAME for build TARGET_NAME in current test specification")
+from mbed_os_tools.test.cmake_handlers import (
+    load_ctest_testsuite,
+    parse_ctesttestfile_line,
+    list_binaries_for_targets,
+    list_binaries_for_builds,
+)

legacy/mbed-greentea/mbed_greentea/mbed_common_api.py

@@ -17,42 +17,7 @@
 Author: Przemyslaw Wirkus <[email protected]>
 """
 
-from subprocess import call, Popen, PIPE
-
-
-def run_cli_command(cmd, shell=True, verbose=False):
-    """! Runs command from command line
-    @param shell Shell command (e.g. ls, ps)
-    @param verbose Verbose mode flag
-    @return Returns (True, 0) if command was executed successfully else return (False, error code)
-    """
-    result = True
-    ret = 0
-    try:
-        ret = call(cmd, shell=shell)
-        if ret:
-            result = False
-            if verbose:
-                print("mbedgt: [ret=%d] Command: %s"% (int(ret), cmd))
-    except OSError as e:
-        result = False
-        if verbose:
-            print("mbedgt: [ret=%d] Command: %s"% (int(ret), cmd))
-            print(str(e))
-    return (result, ret)
-
-def run_cli_process(cmd):
-    """! Runs command as a process and return stdout, stderr and ret code
-    @param cmd Command to execute
-    @return Tuple of (stdout, stderr, returncode)
-    """
-    try:
-        p = Popen(cmd, stdout=PIPE, stderr=PIPE)
-        _stdout, _stderr = p.communicate()
-    except OSError as e:
-        print("mbedgt: Command: %s"% (cmd))
-        print(str(e))
-        print("mbedgt: traceback...")
-        print(e.child_traceback)
-        return str(), str(), -1
-    return _stdout, _stderr, p.returncode
+from mbed_os_tools.test.mbed_common_api import (
+    run_cli_command,
+    run_cli_process,
+)

legacy/mbed-greentea/mbed_greentea/mbed_coverage_api.py

@@ -17,54 +17,4 @@
 Author: Przemyslaw Wirkus <[email protected]>
 """
 
-import os
-
-"""
-def __default_coverage_start_callback(self, key, value, timestamp):
-    # {{__coverage_start;PATH;PAYLOAD}}
-    # PAYLAODED is HEX coded string
-    lcov_path, lcov_payload = value.split(';')
-    try:
-        bin_payload = coverage_pack_hex_payload(lcov_payload)
-        coverage_dump_file(lcov_path, bin_payload)
-
-        self.log("dumped %d bytes to '%s'"% (len(bin_payload), lcov_path))
-    except Exception as e:
-        self.log("LCOV:" + str(e))
-"""
-
-def coverage_pack_hex_payload(payload):
-    """! Convert a block of hex string data back to binary and return the binary data
-    @param payload String with hex encoded ascii data, e.g.: '6164636772...'
-    @return bytearray with payload with data
-    """
-    # This payload might be packed with dot compression
-    # where byte value 0x00 is coded as ".", and not as "00"
-    payload = payload.replace('.', '00')
-
-    hex_pairs = map(''.join, zip(*[iter(payload)] * 2)) # ['61', '64', '63', '67', '72', ... ]
-    bin_payload = bytearray([int(s, 16) for s in hex_pairs])
-    return bin_payload
-
-
-def coverage_dump_file(build_path, path, payload):
-    """! Creates file and dumps payload to it on specified path (even if path doesn't exist)
-    @param path Path to file
-    @param payload Binary data to store in a file
-    @return True if operation was completed
-    """
-    result = True
-    try:
-        d, filename = os.path.split(path)
-        if not os.path.isabs(d) and not os.path.exists(d):
-            # For a relative path that do not exist. Try adding ./build/<yotta target> prefix
-            d = build_path
-            path = os.path.join(d, filename)
-        if not os.path.exists(d):
-            os.makedirs(d)
-        with open(path, "wb") as f:
-            f.write(payload)
-    except IOError as e:
-        print(str(e))
-        result = False
-    return result
+from mbed_os_tools.test.mbed_coverage_api import *