Merge pull request #4837 from theotherjimmy/fix-export-builds

Correct supported check in exporter tests

Author: 0xc0170

tools/test/examples/examples_lib.py

@@ -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)):

tools/toolchains/__init__.py

@@ -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)