Merge pull request #1983 from mbedmicro/fix_config_tests

bogdanm · web-flow · commit f864b8439f1a · 2016-06-22T16:47:32.000+03:00
Fix K64F-based config tests
diff --git a/tools/test/config_test/test12/mbed_app.json b/tools/test/config_test/test12/mbed_app.json
@@ -1,6 +1,14 @@
 {
+    "custom_targets": {
+        "test_target": {
+            "core": "Cortex-M0",
+            "extra_labels": [],
+            "features": [],
+            "default_build": "standard"
+        }
+    },
     "target_overrides": {
-        "K64F": {
+        "test_target": {
             "lib1.p1": "v_p1_lib1_app",
             "lib2.p1": "v_p1_lib2_app"
         }
diff --git a/tools/test/config_test/test12/test_data.py b/tools/test/config_test/test12/test_data.py
@@ -3,7 +3,7 @@
 # named p1 from both lib1 and lib2.
 
 expected_results = {
-   "K64F": {
+   "test_target": {
         "desc": "app without its own parameters overrides parameters in other libs",
         "lib1.p1": "v_p1_lib1_app",
         "lib1.p2": "v_p2_lib1",
diff --git a/tools/test/config_test/test16/mbed_app.json b/tools/test/config_test/test16/mbed_app.json
@@ -1,3 +1,11 @@
 {
+    "custom_targets": {
+        "test_target": {
+            "core": "Cortex-M0",
+            "extra_labels": [],
+            "features": [],
+            "default_build": "standard"
+        }
+    },
     "macros": ["APP1=10", "APP2", "LIB2_1=5"]
 }
diff --git a/tools/test/config_test/test16/test_data.py b/tools/test/config_test/test16/test_data.py
@@ -5,7 +5,7 @@
 # no error should be raised
 
 expected_results = {
-    "K64F": {
+    "test_target": {
         "desc": "test macro definitions",
         "expected_macros": ["APP1=10", "APP2", "LIB1_1=1","LIB1_2", "LIB2_1=5"]
     }
diff --git a/tools/test/config_test/test21/mbed_app.json b/tools/test/config_test/test21/mbed_app.json
@@ -1,4 +1,12 @@
 {
+    "custom_targets": {
+        "test_target": {
+            "core": "Cortex-M0",
+            "extra_labels": [],
+            "features": [],
+            "default_build": "standard"
+        }
+    },
     "target_overrides": {
         "*": {
             "target.features": ["IPV4", "IPV6"]
diff --git a/tools/test/config_test/test21/test_data.py b/tools/test/config_test/test21/test_data.py
@@ -1,7 +1,7 @@
 # Testing basic features
 
 expected_results = {
-    "K64F": {
+    "test_target": {
         "desc": "test basic features",
         "expected_features": ["IPV4", "IPV6"]
     }
diff --git a/tools/test/config_test/test22/mbed_app.json b/tools/test/config_test/test22/mbed_app.json
@@ -1,7 +1,16 @@
 {
+    "custom_targets": {
+        "test_target": {
+            "core": "Cortex-M0",
+            "extra_labels": [],
+            "features": [],
+            "default_build": "standard"
+        }
+    },
     "target_overrides": {
         "*": {
             "target.features_add": ["IPV6"]
         }
     }
 }
+
diff --git a/tools/test/config_test/test22/test_data.py b/tools/test/config_test/test22/test_data.py
@@ -1,7 +1,7 @@
 # Testing when adding two features
 
 expected_results = {
-    "K64F": {
+    "test_target": {
         "desc": "test composing features",
         "expected_features": ["IPV4", "IPV6"]
     }
diff --git a/tools/test/config_test/test24/mbed_app.json b/tools/test/config_test/test24/mbed_app.json
@@ -1,4 +1,12 @@
 {
+    "custom_targets": {
+        "test_target": {
+            "core": "Cortex-M0",
+            "extra_labels": [],
+            "features": [],
+            "default_build": "standard"
+        }
+    },
     "target_overrides": {
         "*": {
             "target.features_add": ["IPV4"]
diff --git a/tools/test/config_test/test24/test_data.py b/tools/test/config_test/test24/test_data.py
@@ -1,7 +1,7 @@
 # Testing if features can enable other features
 
 expected_results = {
-    "K64F": {
+    "test_target": {
         "desc": "test recursive features",
         "expected_features": ["IPV4", "IPV6", "UVISOR"]
     }
diff --git a/tools/test/config_test/test26/mbed_app.json b/tools/test/config_test/test26/mbed_app.json
@@ -1,4 +1,12 @@
 {
+    "custom_targets": {
+        "test_target": {
+            "core": "Cortex-M0",
+            "extra_labels": [],
+            "features": [],
+            "default_build": "standard"
+        }
+    },
     "target_overrides": {
         "*": {
             "target.features_add": ["IPV4"],
diff --git a/tools/test/config_test/test26/test_data.py b/tools/test/config_test/test26/test_data.py
@@ -1,7 +1,7 @@
 # Testing if config settings work in recursive features
 
 expected_results = {
-    "K64F": {
+    "test_target": {
         "desc": "test recursive feature configurations",
         "lib2.test": "GOOD"
     }

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,11 @@`
`1`	`1`	`{`
	`2`	`+ "custom_targets": {`
	`3`	`+ "test_target": {`
	`4`	`+ "core": "Cortex-M0",`
	`5`	`+ "extra_labels": [],`
	`6`	`+ "features": [],`
	`7`	`+ "default_build": "standard"`
	`8`	`+ }`
	`9`	`+ },`
`2`	`10`	`"macros": ["APP1=10", "APP2", "LIB2_1=5"]`
`3`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`# no error should be raised`
`6`	`6`
`7`	`7`	`expected_results = {`
`8`		`- "K64F": {`
	`8`	`+ "test_target": {`
`9`	`9`	`"desc": "test macro definitions",`
`10`	`10`	`"expected_macros": ["APP1=10", "APP2", "LIB1_1=1","LIB1_2", "LIB2_1=5"]`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`# Testing basic features`
`2`	`2`
`3`	`3`	`expected_results = {`
`4`		`- "K64F": {`
	`4`	`+ "test_target": {`
`5`	`5`	`"desc": "test basic features",`
`6`	`6`	`"expected_features": ["IPV4", "IPV6"]`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,16 @@`
`1`	`1`	`{`
	`2`	`+ "custom_targets": {`
	`3`	`+ "test_target": {`
	`4`	`+ "core": "Cortex-M0",`
	`5`	`+ "extra_labels": [],`
	`6`	`+ "features": [],`
	`7`	`+ "default_build": "standard"`
	`8`	`+ }`
	`9`	`+ },`
`2`	`10`	`"target_overrides": {`
`3`	`11`	`"*": {`
`4`	`12`	`"target.features_add": ["IPV6"]`
`5`	`13`	`}`
`6`	`14`	`}`
`7`	`15`	`}`
	`16`	`+`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`# Testing when adding two features`
`2`	`2`
`3`	`3`	`expected_results = {`
`4`		`- "K64F": {`
	`4`	`+ "test_target": {`
`5`	`5`	`"desc": "test composing features",`
`6`	`6`	`"expected_features": ["IPV4", "IPV6"]`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`# Testing if features can enable other features`
`2`	`2`
`3`	`3`	`expected_results = {`
`4`		`- "K64F": {`
	`4`	`+ "test_target": {`
`5`	`5`	`"desc": "test recursive features",`
`6`	`6`	`"expected_features": ["IPV4", "IPV6", "UVISOR"]`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`# Testing if config settings work in recursive features`
`2`	`2`
`3`	`3`	`expected_results = {`
`4`		`- "K64F": {`
	`4`	`+ "test_target": {`
`5`	`5`	`"desc": "test recursive feature configurations",`
`6`	`6`	`"lib2.test": "GOOD"`
`7`	`7`	`}`