Skip to content

Commit 76ea1cc

Browse files
authored
Merge pull request #2317 from geky/fix-ca-config-scan
[tools] Fixed infinite loop in config scan due to list comparison error
2 parents 98c9364 + b45ec0e commit 76ea1cc

File tree

3 files changed

+26
-1
lines changed

3 files changed

+26
-1
lines changed

tools/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ def load_resources(self, resources):
444444
self.add_config_files(resources.json_files)
445445

446446
# Add features while we find new ones
447-
features = self.get_features()
447+
features = set(self.get_features())
448448
if features == prev_features:
449449
break
450450

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"custom_targets": {
3+
"test_target": {
4+
"core": "Cortex-M0",
5+
"extra_labels": [],
6+
"features": [],
7+
"default_build": "standard"
8+
}
9+
},
10+
"target_overrides": {
11+
"*": {
12+
"target.features_add": ["UVISOR"],
13+
"target.extra_labels_add": ["UVISOR_SUPPORTED"]
14+
}
15+
}
16+
}
17+
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Testing when adding two features
2+
3+
expected_results = {
4+
"test_target": {
5+
"desc": "test uvisor feature",
6+
"expected_features": ["UVISOR"]
7+
}
8+
}

0 commit comments

Comments
 (0)