update example script for cmake

Author: Qinghao Shi

tools/test/examples/examples.py

@@ -80,11 +80,10 @@ def parse_args():
                                     official_target_names, "MCU")),
                             default=official_target_names)
 
-    compile_cmd.add_argument(
-        "--profiles",
-        nargs='+',
-        metavar="profile",
-        help="build profile(s)")
+    compile_cmd.add_argument("--profiles",
+                             nargs='+',
+                             metavar="profile",
+                             help="build profile(s)")
 
     compile_cmd.add_argument("-j", "--jobs",
                              dest='jobs',
@@ -93,6 +92,12 @@ def parse_args():
                              default=0,
                              help="Number of concurrent jobs. Default: 0/auto (based on host machine's number of CPUs)")
 
+    compile_cmd.add_argument("--cmake",
+                             action="store_true",
+                             dest="cmake",
+                             default=True,
+                             help="Use Cmake to build job")
+
     compile_cmd.add_argument("-v", "--verbose",
                              action="store_true",
                              dest="verbose",
@@ -159,13 +164,13 @@ def do_deploy(_, config, examples):
 
 def do_compile(args, config, examples):
     """Do the compile step"""
-    results = lib.compile_repos(config, args.toolchains, args.mcu, args.profiles, args.verbose, examples, args.jobs)
+    results = lib.compile_repos(config, args.toolchains, args.mcu, args.profiles, args.verbose, examples, args.cmake, args.jobs)
     failures = lib.get_build_summary(results)
     return failures 
 
 def do_update(args, config, examples):
     """ Test update the mbed-os to the version specified by the tag """
-    return lib.update_mbedos_version(config, args.TAG, examples)
+    return lib.update_example_version(config, args.TAG, examples)
 
 def do_list(_, config, examples):
     """List the examples in the config file"""

tools/test/examples/examples_lib.py

@@ -329,7 +329,7 @@ def export_repos(config, ides, targets, exp_filter):
     return results
 
 
-def compile_repos(config, toolchains, targets, profiles, verbose, exp_filter, jobs=0):
+def compile_repos(config, toolchains, targets, profiles, verbose, exp_filter, cmake=False ,jobs=0):
     """Compiles combinations of example programs, targets and compile chains.
 
        The results are returned in a [key: value] dictionary format:
@@ -382,27 +382,36 @@ def compile_repos(config, toolchains, targets, profiles, verbose, exp_filter, jo
                     summary_string = "%s %s %s" % (name, target, toolchain)
                     logging.info("Compiling %s" % summary_string)
 
-                    build_command = ["mbed-cli", "compile", "-t", toolchain, "-m", target, "-j", str(jobs)] + (['-vv'] if verbose else [])
-                    if profiles:
-                        for profile in profiles:
-                            build_command.extend(["--profile", profile])
-
-                    logging.info("Executing command '%s'..." % " ".join(build_command))
-                    proc = subprocess.Popen(build_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-
-                    std_out, std_err = proc.communicate()
-                    std_out = std_out.decode()
-                    std_err = std_err.decode()
-                    print ("\n#### STDOUT ####\n%s\n#### STDERR ####\n%s\n#### End of STDOUT/STDERR ####\n" % (std_out,std_err))
-
-                    if proc.returncode:
-                        failures.append(example_summary)
+                    if cmake:
+                        build_command_seq = ["mbed-tools configure -t {} -m {}".format(toolchain,target), "rm -fr cmake_build","cmake -S . -B cmake_build -GNinja", "cmake --build cmake_build"]
                     else:
+                        build_command_seq = ["mbed-cli compile -t {} -m {} -j {} {}".format(toolchain, target, str(jobs), '-vv' if verbose else '') ]
+                        if profiles:
+                            for profile in profiles:
+                                build_command_seq[0] += " --profile {}".format(profile)
+
+                    failed_flag = False
+                    for build_command in build_command_seq:
+                        logging.info("Executing command '%s'..." % build_command)
+                        proc = subprocess.Popen(build_command.split(), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+                        std_out, std_err = proc.communicate()
+                        std_out = std_out.decode()
+                        std_err = std_err.decode()
+                        print ("\n#### STDOUT ####\n%s\n#### STDERR ####\n%s\n#### End of STDOUT/STDERR ####\n" % (std_out,std_err))
+
+                        if proc.returncode:
+                            failures.append(example_summary)
+                            failed_flag = True
+                            break
+                    
+                    
+                    if not failed_flag:
                         if example['test']:
                             log = example['compare_log'].pop(0)
                             # example['compare_log'] is a list of log file/files, which matches each examples/sub-examples from same repo. 
                             # pop the log file out of list regardless the compilation for each example pass of fail
-                            image = fetch_output_image(std_out)
+                            image = fetch_output_image(std_out,cmake)
                             if image:
                                 image_info = [{"binary_type": "bootable","path": normpath(join(name,image)),"compare_log":log}]
                                 test_group = "{}-{}-{}".format(target, toolchain, example['baud_rate'])
@@ -438,7 +447,7 @@ def compile_repos(config, toolchains, targets, profiles, verbose, exp_filter, jo
     return results
 
 
-def update_mbedos_version(config, tag, exp_filter):
+def update_example_version(config, tag, exp_filter):
     """ For each example repo identified in the config json object, update the version of
         mbed-os to that specified by the supplied GitHub tag. This function assumes that each
         example repo has already been cloned.
@@ -448,15 +457,15 @@ def update_mbedos_version(config, tag, exp_filter):
     tag - GitHub tag corresponding to a version of mbed-os to upgrade to.
 
     """
-    print("\nUpdating mbed-os in examples to version '%s'\n" % tag)
+    print("\nUpdating examples to version(branch) '%s'\n" % tag)
     for example in config['examples']:
         if example['name'] not in exp_filter:
             continue
         for name in get_sub_examples_list(example):
             update_dir =  name + "/mbed-os"
-            os.chdir(update_dir)
+            os.chdir(name)
             logging.info("In folder '%s'" % name)
-            cmd = "mbed-cli update %s --clean" %tag
+            cmd = "git checkout -B %s origin/%s" %(tag, tag)
             logging.info("Executing command '%s'..." % cmd)
             result = subprocess.call(cmd, shell=True)
             os.chdir(CWD)
@@ -476,26 +485,34 @@ def symlink_mbedos(config, path, exp_filter):
             os.chdir(name)
             logging.info("In folder '%s'" % name)
             if os.path.exists("mbed-os.lib"):
-                logging.info("Removing 'mbed-os.lib' in '%s'" % name)
-                os.remove("mbed-os.lib")
+                logging.info("Replacing 'mbed-os.lib' in '%s'" % name)
+                open("mbed-os.lib", 'w').close()
             else:
                 logging.warning("No 'mbed-os.lib' found in '%s'" % name)
             if os.path.exists("mbed-os"):
                 logging.warning("'mbed-os' already existed in '%s'" % name)
             else:
                 logging.info("Creating Symbolic link '%s'->'mbed-os'" % path)
                 os.symlink(path, "mbed-os")
+                open('mbed-os.lib', 'a').close()
             os.chdir(CWD)
     return 0
 
-def fetch_output_image(output):
+def fetch_output_image(output,cmake):
     """Find the build image from the last 30 lines of a given log"""
     lines = output.splitlines()
     last_index = -31 if len(lines)>29 else (-1 - len(lines))
     for index in range(-1,last_index,-1):
-        if lines[index].startswith("Image:"):
-            image = lines[index][7:]
-            if os.path.isfile(image):
-                return image
+        if cmake:
+            if lines[index].startswith("-- built:") and lines[index].endswith(".bin"):
+                image = lines[index][10:]
+                print("IMAGE is " + image)
+                if os.path.isfile(image):
+                    return image
+        else:
+            if lines[index].startswith("Image:"):
+                image = lines[index][7:]
+                if os.path.isfile(image):
+                    return image
     return False