Skip to content

Commit 0d9d463

Browse files
committed
[build tools] Added proper namespace for features
per @bogdanm
1 parent 99ed4e0 commit 0d9d463

File tree

15 files changed

+24
-24
lines changed

15 files changed

+24
-24
lines changed

tools/config.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -249,20 +249,20 @@ def _process_config_and_overrides(self, data, params, unit_name, unit_kind):
249249
# If the label is defined by the target or it has the special value "*", process the overrides
250250
if (label == '*') or (label in self.target_labels):
251251
# Parse out features
252-
if 'features' in overrides:
253-
features = overrides['features']
254-
self.remove_features(list(set(self.added_features) - set(features)))
252+
if 'target.features' in overrides:
253+
features = overrides['target.features']
254+
self.remove_features(self.added_features - set(features))
255255
self.add_features(features)
256256
self.removed_unecessary_features = True
257-
del overrides['features']
257+
del overrides['target.features']
258258

259-
if 'features_add' in overrides:
260-
self.add_features(overrides['features_add'])
261-
del overrides['features_add']
259+
if 'target.features_add' in overrides:
260+
self.add_features(overrides['target.features_add'])
261+
del overrides['target.features_add']
262262

263-
if 'features_remove' in overrides:
264-
self.remove_features(overrides['features_remove'])
265-
del overrides['features_remove']
263+
if 'target.features_remove' in overrides:
264+
self.remove_features(overrides['target.features_remove'])
265+
del overrides['target.features_remove']
266266

267267
# Consider the others as overrides
268268
for name, v in overrides.items():
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"target_overrides": {
33
"*": {
4-
"features": ["IPV4", "IPV6"]
4+
"target.features": ["IPV4", "IPV6"]
55
}
66
}
77
}

tools/test/config_test/test22/lib1/mbed_lib.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "lib1",
33
"target_overrides": {
44
"*": {
5-
"features_add": ["IPV4"]
5+
"target.features_add": ["IPV4"]
66
}
77
}
88
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"target_overrides": {
33
"*": {
4-
"features_add": ["IPV6"]
4+
"target.features_add": ["IPV6"]
55
}
66
}
77
}

tools/test/config_test/test23/lib1/mbed_lib.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "lib1",
33
"target_overrides": {
44
"*": {
5-
"features_add": ["IPV4"]
5+
"target.features_add": ["IPV4"]
66
}
77
}
88
}

tools/test/config_test/test23/lib2/mbed_lib.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "lib2",
33
"target_overrides": {
44
"*": {
5-
"features_remove": ["IPV4"]
5+
"target.features_remove": ["IPV4"]
66
}
77
}
88
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"target_overrides": {
33
"*": {
4-
"features_add": ["IPV6"]
4+
"target.features_add": ["IPV6"]
55
}
66
}
77
}

tools/test/config_test/test24/FEATURE_IPV4/lib1/mbed_lib.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "lib1",
33
"target_overrides": {
44
"*": {
5-
"features_add": ["IPV6"]
5+
"target.features_add": ["IPV6"]
66
}
77
}
88
}

tools/test/config_test/test24/FEATURE_IPV6/lib2/mbed_lib.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "lib2",
33
"target_overrides": {
44
"*": {
5-
"features_add": ["UVISOR"]
5+
"target.features_add": ["UVISOR"]
66
}
77
}
88
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"target_overrides": {
33
"*": {
4-
"features_add": ["IPV4"]
4+
"target.features_add": ["IPV4"]
55
}
66
}
77
}

tools/test/config_test/test25/FEATURE_IPV6/FEATURE_IPV4/lib1/mbed_lib.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "lib1",
33
"target_overrides": {
44
"*": {
5-
"features_add": ["IPV6"]
5+
"target.features_add": ["IPV6"]
66
}
77
}
88
}

tools/test/config_test/test25/FEATURE_IPV6/lib2/mbed_lib.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "lib2",
33
"target_overrides": {
44
"*": {
5-
"features_add": ["UVISOR"]
5+
"target.features_add": ["UVISOR"]
66
}
77
}
88
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"target_overrides": {
33
"*": {
4-
"features": ["IPV4", "IPV6"]
4+
"target.features": ["IPV4", "IPV6"]
55
}
66
}
77
}

tools/test/config_test/test26/FEATURE_IPV4/lib1/mbed_lib.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "lib1",
33
"target_overrides": {
44
"*": {
5-
"features_add": ["IPV6"]
5+
"target.features_add": ["IPV6"]
66
}
77
}
88
}

tools/test/config_test/test26/mbed_app.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"target_overrides": {
33
"*": {
4-
"features_add": ["IPV4"],
4+
"target.features_add": ["IPV4"],
55
"lib2.test": "GOOD"
66
}
77
}

0 commit comments

Comments
 (0)