Merge pull request #2879 from bridadan/fix-config-tests-ipv6

sg- · web-flow · commit cf60b189b032 · 2016-10-01T17:22:38.000-05:00
Renames IPV6 feature used in config test to STORAGE
diff --git a/tools/test/config_test/test21/mbed_app.json b/tools/test/config_test/test21/mbed_app.json
@@ -1,7 +1,7 @@
 {
     "target_overrides": {
         "*": {
-            "target.features": ["IPV4", "IPV6"]
+            "target.features": ["IPV4"]
         }
     }
 }
diff --git a/tools/test/config_test/test21/test_data.py b/tools/test/config_test/test21/test_data.py
@@ -3,6 +3,6 @@
 expected_results = {
     "test_target": {
         "desc": "test basic features",
-        "expected_features": ["IPV4", "IPV6"]
+        "expected_features": ["IPV4"]
     }
 }
diff --git a/tools/test/config_test/test22/mbed_app.json b/tools/test/config_test/test22/mbed_app.json
@@ -1,7 +1,7 @@
 {
     "target_overrides": {
         "*": {
-            "target.features_add": ["IPV6"]
+            "target.features_add": ["STORAGE"]
         }
     }
 }
diff --git a/tools/test/config_test/test22/test_data.py b/tools/test/config_test/test22/test_data.py
@@ -3,6 +3,6 @@
 expected_results = {
     "test_target": {
         "desc": "test composing features",
-        "expected_features": ["IPV4", "IPV6"]
+        "expected_features": ["IPV4", "STORAGE"]
     }
 }
diff --git a/tools/test/config_test/test23/mbed_app.json b/tools/test/config_test/test23/mbed_app.json
@@ -1,7 +1,7 @@
 {
     "target_overrides": {
         "*": {
-            "target.features_add": ["IPV6"]
+            "target.features_add": ["STORAGE"]
         }
     }
 }
diff --git a/tools/test/config_test/test24/FEATURE_IPV4/lib1/mbed_lib.json b/tools/test/config_test/test24/FEATURE_IPV4/lib1/mbed_lib.json
@@ -2,7 +2,7 @@
     "name": "lib1",
     "target_overrides": {
         "*": {
-            "target.features_add": ["IPV6"]
+            "target.features_add": ["STORAGE"]
         }
     }
 }
diff --git a/tools/test/config_test/test24/FEATURE_STORAGE/lib2/mbed_lib.json b/tools/test/config_test/test24/FEATURE_STORAGE/lib2/mbed_lib.json
diff --git a/tools/test/config_test/test24/test_data.py b/tools/test/config_test/test24/test_data.py
@@ -3,6 +3,6 @@
 expected_results = {
     "test_target": {
         "desc": "test recursive features",
-        "expected_features": ["IPV4", "IPV6", "UVISOR"]
+        "expected_features": ["IPV4", "STORAGE", "UVISOR"]
     }
 }
diff --git a/tools/test/config_test/test25/FEATURE_STORAGE/FEATURE_IPV4/lib1/mbed_lib.json b/tools/test/config_test/test25/FEATURE_STORAGE/FEATURE_IPV4/lib1/mbed_lib.json
@@ -2,7 +2,7 @@
     "name": "lib1",
     "target_overrides": {
         "*": {
-            "target.features_add": ["IPV6"]
+            "target.features_add": ["STORAGE"]
         }
     }
 }
diff --git a/tools/test/config_test/test25/FEATURE_STORAGE/lib2/mbed_lib.json b/tools/test/config_test/test25/FEATURE_STORAGE/lib2/mbed_lib.json
diff --git a/tools/test/config_test/test25/mbed_app.json b/tools/test/config_test/test25/mbed_app.json
@@ -1,7 +1,7 @@
 {
     "target_overrides": {
         "*": {
-            "target.features": ["IPV4", "IPV6"]
+            "target.features": ["IPV4", "STORAGE"]
         }
     }
 }
diff --git a/tools/test/config_test/test26/FEATURE_IPV4/lib1/mbed_lib.json b/tools/test/config_test/test26/FEATURE_IPV4/lib1/mbed_lib.json
@@ -2,7 +2,7 @@
     "name": "lib1",
     "target_overrides": {
         "*": {
-            "target.features_add": ["IPV6"]
+            "target.features_add": ["STORAGE"]
         }
     }
 }
diff --git a/tools/test/config_test/test26/FEATURE_STORAGE/lib2/mbed_lib.json b/tools/test/config_test/test26/FEATURE_STORAGE/lib2/mbed_lib.json

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", "IPV6"]`
	`4`	`+ "target.features": ["IPV4"]`
`5`	`5`	`}`
`6`	`6`	`}`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@`
`3`	`3`	`expected_results = {`
`4`	`4`	`"test_target": {`
`5`	`5`	`"desc": "test basic features",`
`6`		`- "expected_features": ["IPV4", "IPV6"]`
	`6`	`+ "expected_features": ["IPV4"]`
`7`	`7`	`}`
`8`	`8`	`}`
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": ["IPV6"]`
	`5`	`+ "target.features_add": ["STORAGE"]`
`6`	`6`	`}`
`7`	`7`	`}`
`8`	`8`	`}`