Fixing tool config tests

bridadan · bridadan · commit f9b236a0e12e · 2018-11-08T16:55:59.000-06:00
diff --git a/tools/test/config/feature_compesition/lib1/mbed_lib.json b/tools/test/config/feature_compesition/lib1/mbed_lib.json
@@ -2,7 +2,7 @@
     "name": "lib1",
     "target_overrides": {
         "*": {
-            "target.features_add": ["IPV4"]
+            "target.features_add": ["LWIP"]
         }
     }
 }
diff --git a/tools/test/config/feature_compesition/test_data.json b/tools/test/config/feature_compesition/test_data.json
@@ -1,5 +1,5 @@
 {
     "test_target": {
-        "expected_features": ["IPV4", "STORAGE"]
+        "expected_features": ["LWIP", "STORAGE"]
     }
 }
diff --git a/tools/test/config/feature_conflict/lib1/mbed_lib.json b/tools/test/config/feature_conflict/lib1/mbed_lib.json
@@ -2,7 +2,7 @@
     "name": "lib1",
     "target_overrides": {
         "*": {
-            "target.features_add": ["IPV4"]
+            "target.features_add": ["LWIP"]
         }
     }
 }
diff --git a/tools/test/config/feature_conflict/lib2/mbed_lib.json b/tools/test/config/feature_conflict/lib2/mbed_lib.json
@@ -2,7 +2,7 @@
     "name": "lib2",
     "target_overrides": {
         "*": {
-            "target.features_remove": ["IPV4"]
+            "target.features_remove": ["LWIP"]
         }
     }
 }
diff --git a/tools/test/config/feature_conflict/test_data.json b/tools/test/config/feature_conflict/test_data.json
@@ -1,5 +1,5 @@
 {
     "K64F": {
-        "exception_msg": "Configuration conflict. The feature IPV4 both added and removed." 
+        "exception_msg": "Configuration conflict. The feature LWIP both added and removed." 
     }
 }
diff --git a/tools/test/config/feature_recursive_add/FEATURE_LWIP/lib1/mbed_lib.json b/tools/test/config/feature_recursive_add/FEATURE_LWIP/lib1/mbed_lib.json
diff --git a/tools/test/config/feature_recursive_add/mbed_app.json b/tools/test/config/feature_recursive_add/mbed_app.json
@@ -1,7 +1,7 @@
 {
     "target_overrides": {
         "*": {
-            "target.features_add": ["IPV4"]
+            "target.features_add": ["LWIP"]
         }
     }
 }
diff --git a/tools/test/config/feature_recursive_add/test_data.json b/tools/test/config/feature_recursive_add/test_data.json
@@ -1,5 +1,5 @@
 {
     "test_target": {
-        "expected_features": ["IPV4", "STORAGE"]
+        "expected_features": ["LWIP", "STORAGE"]
     }
 }
diff --git a/tools/test/config/feature_recursive_complex/FEATURE_LWIP/lib1/mbed_lib.json b/tools/test/config/feature_recursive_complex/FEATURE_LWIP/lib1/mbed_lib.json
diff --git a/tools/test/config/feature_recursive_complex/mbed_app.json b/tools/test/config/feature_recursive_complex/mbed_app.json
@@ -1,7 +1,7 @@
 {
     "target_overrides": {
         "*": {
-            "target.features_add": ["IPV4"],
+            "target.features_add": ["LWIP"],
             "lib2.test": "GOOD"
         }
     }
diff --git a/tools/test/config/feature_remove/lib1/mbed_lib.json b/tools/test/config/feature_remove/lib1/mbed_lib.json
@@ -2,7 +2,7 @@
     "name": "lib1",
     "target_overrides": {
         "*": {
-            "target.features_remove": ["IPV4"]
+            "target.features_remove": ["LWIP"]
         }
     }
 }
diff --git a/tools/test/config/feature_remove/targets.json b/tools/test/config/feature_remove/targets.json
@@ -3,7 +3,7 @@
         "supported_toolchains": ["GCC_ARM"],
         "core": "Cortex-M0",
         "extra_labels": [],
-        "features": ["IPV4"],
+        "features": ["LWIP"],
         "default_lib": "std"
     }
 }
diff --git a/tools/test/config/fetaure_recursive_conflict/FEATURE_STORAGE/FEATURE_LWIP/lib1/mbed_lib.json b/tools/test/config/fetaure_recursive_conflict/FEATURE_STORAGE/FEATURE_LWIP/lib1/mbed_lib.json
@@ -0,0 +1,8 @@
+{
+    "name": "lib1",
+    "target_overrides": {
+        "*": {
+            "target.features_add": ["STORAGE"]
+        }
+    }
+}
diff --git a/tools/test/config/simple_features/mbed_app.json b/tools/test/config/simple_features/mbed_app.json
@@ -1,7 +1,7 @@
 {
     "target_overrides": {
         "*": {
-            "target.features": ["IPV4"]
+            "target.features": ["LWIP"]
         }
     }
 }
diff --git a/tools/test/config/simple_features/test_data.json b/tools/test/config/simple_features/test_data.json
@@ -1,5 +1,5 @@
 {
     "test_target": {
-        "expected_features": ["IPV4"]
+        "expected_features": ["LWIP"]
     }
 }

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": ["IPV4"]`
	`5`	`+ "target.features_add": ["LWIP"]`
`6`	`6`	`}`
`7`	`7`	`}`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"test_target": {`
`3`		`- "expected_features": ["IPV4", "STORAGE"]`
	`3`	`+ "expected_features": ["LWIP", "STORAGE"]`
`4`	`4`	`}`
`5`	`5`	`}`
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_remove": ["IPV4"]`
	`5`	`+ "target.features_remove": ["LWIP"]`
`6`	`6`	`}`
`7`	`7`	`}`
`8`	`8`	`}`
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 IPV4 both added and removed."`
	`3`	`+ "exception_msg": "Configuration conflict. The feature LWIP both added and removed."`
`4`	`4`	`}`
`5`	`5`	`}`
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_add": ["IPV4"]`
	`4`	`+ "target.features_add": ["LWIP"]`
`5`	`5`	`}`
`6`	`6`	`}`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`"supported_toolchains": ["GCC_ARM"],`
`4`	`4`	`"core": "Cortex-M0",`
`5`	`5`	`"extra_labels": [],`
`6`		`- "features": ["IPV4"],`
	`6`	`+ "features": ["LWIP"],`
`7`	`7`	`"default_lib": "std"`
`8`	`8`	`}`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"test_target": {`
`3`		`- "expected_features": ["IPV4"]`
	`3`	`+ "expected_features": ["LWIP"]`
`4`	`4`	`}`
`5`	`5`	`}`