Skip to content

Commit 74586ec

Browse files
committed
Re-add "fetaure_recursive_conflict" config test
1 parent e635613 commit 74586ec

File tree

4 files changed

+28
-0
lines changed

4 files changed

+28
-0
lines changed
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"name": "lib1",
3+
"target_overrides": {
4+
"*": {
5+
"target.features_add": ["STORAGE"]
6+
}
7+
}
8+
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"name": "lib2",
3+
"target_overrides": {
4+
"*": {
5+
"target.features_add": ["UVISOR"]
6+
}
7+
}
8+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"target_overrides": {
3+
"*": {
4+
"target.features": ["IPV4", "STORAGE"]
5+
}
6+
}
7+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"K64F": {
3+
"exception_msg": "Configuration conflict. The feature UVISOR both added and removed."
4+
}
5+
}

0 commit comments

Comments
 (0)