Fixing the recursive feature conflict config test

bridadan · bridadan · commit 06cce95b55cb · 2018-11-08T16:56:00.000-06:00
diff --git a/tools/test/config/fetaure_recursive_conflict/FEATURE_STORAGE/FEATURE_BOOTLOADER/lib1/mbed_lib.json b/tools/test/config/fetaure_recursive_conflict/FEATURE_STORAGE/FEATURE_BOOTLOADER/lib1/mbed_lib.json
@@ -2,7 +2,7 @@
     "name": "lib1",
     "target_overrides": {
         "*": {
-            "target.features_add": ["STORAGE"]
+            "target.features_remove": ["STORAGE"]
         }
     }
 }
diff --git a/tools/test/config/fetaure_recursive_conflict/FEATURE_STORAGE/FEATURE_IPV4/lib1/mbed_lib.json b/tools/test/config/fetaure_recursive_conflict/FEATURE_STORAGE/FEATURE_IPV4/lib1/mbed_lib.json
diff --git a/tools/test/config/fetaure_recursive_conflict/FEATURE_STORAGE/lib2/mbed_lib.json b/tools/test/config/fetaure_recursive_conflict/FEATURE_STORAGE/lib2/mbed_lib.json
@@ -2,7 +2,7 @@
     "name": "lib2",
     "target_overrides": {
         "*": {
-            "target.features_add": ["UVISOR"]
+            "target.features_add": ["BOOTLOADER"]
         }
     }
 }
diff --git a/tools/test/config/fetaure_recursive_conflict/mbed_app.json b/tools/test/config/fetaure_recursive_conflict/mbed_app.json
@@ -1,7 +1,7 @@
 {
     "target_overrides": {
         "*": {
-            "target.features": ["IPV4", "STORAGE"]
+            "target.features_add": ["STORAGE"]
         }
     }
 }
diff --git a/tools/test/config/fetaure_recursive_conflict/test_data.json b/tools/test/config/fetaure_recursive_conflict/test_data.json
@@ -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." 
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"name": "lib1",`
`3`	`3`	`"target_overrides": {`
`4`	`4`	`"*": {`
`5`		`- "target.features_add": ["STORAGE"]`
	`5`	`+ "target.features_remove": ["STORAGE"]`
`6`	`6`	`}`
`7`	`7`	`}`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"name": "lib2",`
`3`	`3`	`"target_overrides": {`
`4`	`4`	`"*": {`
`5`		`- "target.features_add": ["UVISOR"]`
	`5`	`+ "target.features_add": ["BOOTLOADER"]`
`6`	`6`	`}`
`7`	`7`	`}`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"target_overrides": {`
`3`	`3`	`"*": {`
`4`		`- "target.features": ["IPV4", "STORAGE"]`
	`4`	`+ "target.features_add": ["STORAGE"]`
`5`	`5`	`}`
`6`	`6`	`}`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"K64F": {`
`3`		`- "exception_msg": "Configuration conflict. The feature UVISOR both added and removed."`
	`3`	`+ "exception_msg": "Configuration conflict. The feature STORAGE both added and removed."`
`4`	`4`	`}`
`5`	`5`	`}`