Skip to content

Commit 134d774

Browse files
committed
Correctly filtering examples in test script.
If an example's GitHub repository contains multiple child examples, the script was incorrectly filtering out all the child examples when compiling and exporting. This patch now handles this case correctly.
1 parent 315d893 commit 134d774

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

tools/test/examples/examples_lib.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import sys
1111
import subprocess
1212
from shutil import rmtree
13+
from sets import Set
1314

1415
ROOT = abspath(dirname(dirname(dirname(dirname(__file__)))))
1516
sys.path.insert(0, ROOT)
@@ -250,11 +251,13 @@ def export_repos(config, ides, targets, examples):
250251
ides - List of IDES to export to
251252
"""
252253
results = {}
254+
valid_examples = Set(examples)
253255
print("\nExporting example repos....\n")
254256
for example in config['examples']:
255-
if example['name'] not in examples:
257+
example_names = [basename(x['repo']) for x in get_repo_list(example)]
258+
common_examples = valid_examples.intersection(Set(example_names))
259+
if not common_examples:
256260
continue
257-
258261
export_failures = []
259262
build_failures = []
260263
build_skips = []
@@ -331,9 +334,12 @@ def compile_repos(config, toolchains, targets, examples):
331334
332335
"""
333336
results = {}
337+
valid_examples = Set(examples)
334338
print("\nCompiling example repos....\n")
335339
for example in config['examples']:
336-
if example['name'] not in examples:
340+
example_names = [basename(x['repo']) for x in get_repo_list(example)]
341+
common_examples = valid_examples.intersection(Set(example_names))
342+
if not common_examples:
337343
continue
338344
failures = []
339345
successes = []
@@ -349,6 +355,7 @@ def compile_repos(config, toolchains, targets, examples):
349355
for target, toolchain in target_cross_toolchain(valid_choices(example['targets'], targets),
350356
valid_choices(example['toolchains'], toolchains),
351357
example['features']):
358+
print("Compiling %s for %s, %s" % (name, target, toolchain))
352359
proc = subprocess.Popen(["mbed-cli", "compile", "-t", toolchain,
353360
"-m", target, "--silent"])
354361
proc.wait()

0 commit comments

Comments
 (0)