Merge pull request #2317 from geky/fix-ca-config-scan

[tools] Fixed infinite loop in config scan due to list comparison error
pull/2331/merge
Sam Grove 2016-08-02 17:05:13 -05:00 committed by GitHub
commit 76ea1ccb4a
3 changed files with 26 additions and 1 deletions

View File

@ -444,7 +444,7 @@ class Config:
self.add_config_files(resources.json_files)
# Add features while we find new ones
features = self.get_features()
features = set(self.get_features())
if features == prev_features:
break

View File

@ -0,0 +1,17 @@
{
"custom_targets": {
"test_target": {
"core": "Cortex-M0",
"extra_labels": [],
"features": [],
"default_build": "standard"
}
},
"target_overrides": {
"*": {
"target.features_add": ["UVISOR"],
"target.extra_labels_add": ["UVISOR_SUPPORTED"]
}
}
}

View File

@ -0,0 +1,8 @@
# Testing when adding two features
expected_results = {
"test_target": {
"desc": "test uvisor feature",
"expected_features": ["UVISOR"]
}
}