Skip to content

Correct supported check in exporter tests #4837

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 2, 2017
Merged

Correct supported check in exporter tests #4837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca0c2a8
Correct supported check in exporter tests
theotherjimmy Jul 31, 2017
8b31078
Add missing collect_include passing
theotherjimmy Aug 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tools/test/examples/examples_lib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ def target_cross_ide(allowed_targets, allowed_ides, features=[], toolchains=[]):
"""
for target in allowed_targets:
for ide in allowed_ides:
if (target in EXPORTERS[ide].TARGETS and
if (EXPORTERS[ide].is_target_supported(target) and
(not toolchains or EXPORTERS[ide].TOOLCHAIN in toolchains) and
all(feature in TARGET_MAP[target].features
for feature in features)):
Expand Down
3 changes: 2 additions & 1 deletion tools/toolchains/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,7 +692,8 @@ def _add_dir(self, path, resources, base_path, exclude_paths=None):
# Recursively scan features but ignore them in the current scan.
# These are dynamically added by the config system if the conditions are matched
def closure (dir_path=dir_path, base_path=base_path):
return self.scan_resources(dir_path, base_path=base_path)
return self.scan_resources(dir_path, base_path=base_path,
collect_ignores=resources.collect_ignores)
resources.features.add_lazy(d[8:], closure)
resources.ignore_dir(dir_path)
dirs.remove(d)
Expand Down