ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #13580 from jamesbeyond/cmake_exp 

TEST: Update example scripts for cmake feature
pull/13594/head
Martin Kojtal 2020-09-10 15:05:12 +01:00 committed by GitHub
parent f7d5dfbe3b d86a97b21c
commit fc6fbd9f6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/test/examples/README.md
View File

@ -16,7 +16,7 @@ The scripts in this folder are used for testing `mbed-os` official examples. It
* **deploy** - if the example directory exists as provided by the .json configuration file, pulls in the examples dependencies by using `mbed-cli deploy`.
* **update** - for each example repo identified in the config .json object, updates the version of `mbed-os` to that specified by the supplied GitHub tag. This function assumes that each example repo has already been cloned.
* **update** - for each example repo identified in the config .json object, updates the version of example to that specified by the supplied GitHub tag. This function assumes that each example repo has already been cloned.
* **compile** - compiles combinations of example programs, targets and compile chains.

5
tools/test/examples/examples.py
View File

@ -93,6 +93,7 @@ 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=False, help="Use Cmake to build example")
compile_cmd.add_argument("-v", "--verbose",
action="store_true",
dest="verbose",
@ -164,8 +165,8 @@ def do_compile(args, config, examples):
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)
""" Test update the example to the version specified by the tag """
return lib.update_example_version(config, args.TAG, examples)
def do_list(_, config, examples):
"""List the examples in the config file"""

15
tools/test/examples/examples_lib.py
View File

@ -438,9 +438,9 @@ 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 to that specified by the supplied GitHub tag. This function assumes that each
example repo has already been cloned.
Args:
@ -448,15 +448,14 @@ 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 example 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,8 +475,8 @@ 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' with empty file 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"):