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

Fix after rebase

pull/7745/head
Olli-Pekka Puolitaival 2018-08-29 15:00:42 +03:00
parent 1209e73e0c
commit 4e38f73067
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tools/test_api.py
View File

@ -2110,11 +2110,22 @@ def find_tests(base_dir, target_name, toolchain_name, icetea, greentea, app_conf
d = join(directory, test_group_directory, test_case_directory) d = join(directory, test_group_directory, test_case_directory)
if not isdir(d) or ignoreset.is_ignored(d): if not isdir(d) or ignoreset.is_ignored(d):
continue continue
if 'device' == subdir: special_dirs = ['host_tests', 'COMMON']
for test_dir in os.listdir(d): if test_group_directory not in special_dirs and test_case_directory not in special_dirs:
test_dir_path = join(d, test_dir) test_name = test_path_to_name(d, base_dir)
test_name = test_path_to_name(test_dir_path, base_dir) tests[(test_name, directory, test_group_directory, test_case_directory)] = [d]
tests[(test_name, directory, subdir, test_dir)] = [test_dir_path] if test_case_directory == 'COMMON':
def predicate(base_pred, group_pred, name_base_group_case):
(name, base, group, case) = name_base_group_case
return base == base_pred and group == group_pred
commons.append((functools.partial(predicate, directory, test_group_directory), d))
if test_group_directory == 'COMMON':
def predicate(base_pred, name_base_group_case):
(name, base, group, case) = name_base_group_case
return base == base_pred
commons.append((functools.partial(predicate, directory), grp_dir))
if icetea: if icetea:
dirs = [d for d in base_resources.ignored_dirs if basename(d) == 'TEST_APPS'] dirs = [d for d in base_resources.ignored_dirs if basename(d) == 'TEST_APPS']
@ -2124,6 +2135,12 @@ def find_tests(base_dir, target_name, toolchain_name, icetea, greentea, app_conf
for subdir in os.listdir(directory): for subdir in os.listdir(directory):
d = join(directory, subdir) d = join(directory, subdir)
if not isdir(d): if not isdir(d):
continue
if 'device' == subdir:
for test_dir in os.listdir(d):
test_dir_path = join(d, test_dir)
test_name = test_path_to_name(test_dir_path, base_dir)
tests[(test_name, directory, subdir, test_dir)] = [test_dir_path]
# Apply common directories # Apply common directories
for pred, path in commons: for pred, path in commons: