ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixing the recursive feature conflict config test

pull/8685/head
Brian Daniels 2018-11-08 15:06:35 -06:00
parent 332a67a112
commit 06cce95b55
5 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/test/config/fetaure_recursive_conflict/FEATURE_STORAGE/FEATURE_BOOTLOADER/lib1/mbed_lib.json
View File

@ -2,7 +2,7 @@
"name": "lib1",
"target_overrides": {
"*": {
"target.features_add": ["STORAGE"]
"target.features_remove": ["STORAGE"]
}
}
}

8
tools/test/config/fetaure_recursive_conflict/FEATURE_STORAGE/FEATURE_IPV4/lib1/mbed_lib.json
View File

@ -1,8 +0,0 @@
{
"name": "lib1",
"target_overrides": {
"*": {
"target.features_add": ["STORAGE"]
}
}
}

2
tools/test/config/fetaure_recursive_conflict/FEATURE_STORAGE/lib2/mbed_lib.json
View File

@ -2,7 +2,7 @@
"name": "lib2",
"target_overrides": {
"*": {
"target.features_add": ["UVISOR"]
"target.features_add": ["BOOTLOADER"]
}
}
}

2
tools/test/config/fetaure_recursive_conflict/mbed_app.json
View File

@ -1,7 +1,7 @@
{
"target_overrides": {
"*": {
"target.features": ["IPV4", "STORAGE"]
"target.features_add": ["STORAGE"]
}
}
}

2
tools/test/config/fetaure_recursive_conflict/test_data.json
View File

@ -1,5 +1,5 @@
{
"K64F": {
"exception_msg": "Configuration conflict. The feature UVISOR both added and removed."
"exception_msg": "Configuration conflict. The feature STORAGE both added and removed."
}
}