Fixed the build tools test case failure

rajkan01 · rajkan01 · commit 2e21f7152421 · 2019-12-10T09:20:34.000-08:00
diff --git a/tools/test/config/app_override_libs/targets.json b/tools/test/config/app_override_libs/targets.json
@@ -4,6 +4,11 @@
         "extra_labels": [],
         "features": [],
         "default_lib": "std",
-        "supported_toolchains": ["GCC_ARM"]
+        "supported_toolchains": ["GCC_ARM"],
+        "supported_c_libs": {
+                "arm": ["std"],
+                "gcc_arm": ["std", "small"],
+                "iar": ["std"]
+        }
     }
 }
diff --git a/tools/test/config/compound_inheritance/targets.json b/tools/test/config/compound_inheritance/targets.json
@@ -3,6 +3,11 @@
         "supported_toolchains": ["GCC_ARM"],
         "extra_labels": [],
         "default_lib": "std",
+        "supported_c_libs": {
+                "arm": ["std"],
+                "gcc_arm": ["std", "small"],
+                "iar": ["std"]
+        },
         "core": "Cortex-M0",
         "config": {
             "base1_1": "v_base1_1_b1",
diff --git a/tools/test/config/double_define/targets.json b/tools/test/config/double_define/targets.json
@@ -3,6 +3,11 @@
         "supported_toolchains": ["GCC_ARM"],
         "extra_labels": [],
         "default_lib": "std",
+        "supported_c_libs": {
+                "arm": ["std"],
+                "gcc_arm": ["std", "small"],
+                "iar": ["std"]
+        },
         "core": "Cortex-M0",
         "config": {
             "base1_1": "v_base1_1_b1",
@@ -14,6 +19,11 @@
         "supported_toolchains": ["GCC_ARM"],
         "extra_labels": [],
         "default_lib": "std",
+        "supported_c_libs": {
+                "arm": ["std"],
+                "gcc_arm": ["std", "small"],
+                "iar": ["std"]
+        },
         "core": "Cortex-M0",
         "config": {
             "base2_1": "v_base2_1_b2",
diff --git a/tools/test/config/feature_compesition/targets.json b/tools/test/config/feature_compesition/targets.json
@@ -4,6 +4,11 @@
         "core": "Cortex-M0",
         "extra_labels": [],
         "features": [],
-        "default_lib": "std"
+        "default_lib": "std",
+        "supported_c_libs": {
+                "arm": ["std"],
+                "gcc_arm": ["std", "small"],
+                "iar": ["std"]
+        }
     }
 }
diff --git a/tools/test/config/feature_recursive_add/targets.json b/tools/test/config/feature_recursive_add/targets.json
@@ -4,6 +4,11 @@
         "core": "Cortex-M0",
         "extra_labels": [],
         "features": [],
-        "default_lib": "std"
+        "default_lib": "std",
+        "supported_c_libs": {
+                "arm": ["std"],
+                "gcc_arm": ["std", "small"],
+                "iar": ["std"]
+        }
     }
 }
diff --git a/tools/test/config/feature_recursive_complex/targets.json b/tools/test/config/feature_recursive_complex/targets.json
@@ -4,6 +4,11 @@
         "core": "Cortex-M0",
         "extra_labels": [],
         "features": [],
-        "default_lib": "std"
+        "default_lib": "std",
+        "supported_c_libs": {
+                "arm": ["std"],
+                "gcc_arm": ["std", "small"],
+                "iar": ["std"]
+        }
     }
 }
diff --git a/tools/test/config/feature_remove/targets.json b/tools/test/config/feature_remove/targets.json
@@ -4,6 +4,11 @@
         "core": "Cortex-M0",
         "extra_labels": [],
         "features": ["BOOTLOADER"],
-        "default_lib": "std"
+        "default_lib": "std",
+        "supported_c_libs": {
+                "arm": ["std"],
+                "gcc_arm": ["std", "small"],
+                "iar": ["std"]
+        }
     }
 }
diff --git a/tools/test/config/lib_requires_missing_lib/targets.json b/tools/test/config/lib_requires_missing_lib/targets.json
@@ -4,6 +4,11 @@
         "core": "Cortex-M0",
         "extra_labels": [],
         "features": [],
-        "default_lib": "std"
+        "default_lib": "std",
+        "supported_c_libs": {
+                "arm": ["std"],
+                "gcc_arm": ["std", "small"],
+                "iar": ["std"]
+        }
     }
 }
diff --git a/tools/test/config/macro_inheritance/targets.json b/tools/test/config/macro_inheritance/targets.json
@@ -4,6 +4,11 @@
         "core": "Cortex-M0",
         "extra_labels": [],
         "features": [],
-        "default_lib": "std"
+        "default_lib": "std",
+        "supported_c_libs": {
+                "arm": ["std"],
+                "gcc_arm": ["std", "small"],
+                "iar": ["std"]
+        }
     }
 }
diff --git a/tools/test/config/override_labels_libs/targets.json b/tools/test/config/override_labels_libs/targets.json
@@ -3,6 +3,11 @@
         "supported_toolchains": ["GCC_ARM"],
         "extra_labels": [],
         "default_lib": "std",
+        "supported_c_libs": {
+                "arm": ["std"],
+                "gcc_arm": ["std", "small"],
+                "iar": ["std"]
+        },
         "core": "Cortex-M0"
     },
     "b1": {
diff --git a/tools/test/config/override_labels_libs_more/targets.json b/tools/test/config/override_labels_libs_more/targets.json
@@ -3,6 +3,11 @@
         "supported_toolchains": ["GCC_ARM"],
         "extra_labels": [],
         "default_lib": "std",
+        "supported_c_libs": {
+                "arm": ["std"],
+                "gcc_arm": ["std", "small"],
+                "iar": ["std"]
+        },
         "core": "Cortex-M0"
     },
     "b1": {
diff --git a/tools/test/config/override_labels_targets/targets.json b/tools/test/config/override_labels_targets/targets.json
@@ -3,6 +3,11 @@
         "supported_toolchains": ["GCC_ARM"],
         "extra_labels": [],
         "default_lib": "std",
+        "supported_c_libs": {
+                "arm": ["std"],
+                "gcc_arm": ["std", "small"],
+                "iar": ["std"]
+        },
         "core": "Cortex-M0",
         "config": {
             "par1": "v_par1_base",
diff --git a/tools/test/config/override_precidence/targets.json b/tools/test/config/override_precidence/targets.json
@@ -8,6 +8,11 @@
             "par1": "v_par1_base",
             "par2": "v_par2_base",
             "par3": "v_par3_base"
+        },
+        "supported_c_libs": {
+                "arm": ["std"],
+                "gcc_arm": ["std", "small"],
+                "iar": ["std"]
         }
     },
     "b1": {
diff --git a/tools/test/config/override_undefined/targets.json b/tools/test/config/override_undefined/targets.json
@@ -3,6 +3,11 @@
         "supported_toolchains": ["GCC_ARM"],
         "extra_labels": [],
         "default_lib": "std",
+        "supported_c_libs": {
+                "arm": ["std"],
+                "gcc_arm": ["std", "small"],
+                "iar": ["std"]
+        },
         "core": "Cortex-M0",
         "config": {
             "base1_1": "v_base1_1_b1",
diff --git a/tools/test/config/override_undefined_libs/targets.json b/tools/test/config/override_undefined_libs/targets.json
@@ -3,6 +3,11 @@
         "supported_toolchains": ["GCC_ARM"],
         "extra_labels": [],
         "default_lib": "std",
+        "supported_c_libs": {
+                "arm": ["std"],
+                "gcc_arm": ["std", "small"],
+                "iar": ["std"]
+        },
         "core": "Cortex-M0"
     },
     "left_intermediate": {
diff --git a/tools/test/config/override_with_labels/targets.json b/tools/test/config/override_with_labels/targets.json
@@ -3,6 +3,11 @@
         "supported_toolchains": ["GCC_ARM"],
         "extra_labels": [],
         "default_lib": "std",
+        "supported_c_libs": {
+                "arm": ["std"],
+                "gcc_arm": ["std", "small"],
+                "iar": ["std"]
+        },
         "core": "Cortex-M0"
     },
     "left_intermediate": {
diff --git a/tools/test/config/range_limits/targets.json b/tools/test/config/range_limits/targets.json
@@ -4,6 +4,11 @@
         "extra_labels": [],
         "features": [],
         "default_lib": "std",
+        "supported_c_libs": {
+                "arm": ["std"],
+                "gcc_arm": ["std", "small"],
+                "iar": ["std"]
+        },
         "supported_toolchains": ["GCC_ARM"]
     }
 }
diff --git a/tools/test/config/range_limits_invalid/targets.json b/tools/test/config/range_limits_invalid/targets.json
@@ -4,6 +4,11 @@
         "extra_labels": [],
         "features": [],
         "default_lib": "std",
-        "supported_toolchains": ["GCC_ARM"]
+        "supported_toolchains": ["GCC_ARM"],
+        "supported_c_libs": {
+                "arm": ["std"],
+                "gcc_arm": ["std", "small"],
+                "iar": ["std"]
+        }
     }
 }
diff --git a/tools/test/config/range_limits_override_invalid/targets.json b/tools/test/config/range_limits_override_invalid/targets.json
@@ -4,6 +4,11 @@
         "extra_labels": [],
         "features": [],
         "default_lib": "std",
+        "supported_c_libs": {
+                "arm": ["std"],
+                "gcc_arm": ["std", "small"],
+                "iar": ["std"]
+        },
         "supported_toolchains": ["GCC_ARM"]
     }
 }
diff --git a/tools/test/config/requires_exclude_in_include/targets.json b/tools/test/config/requires_exclude_in_include/targets.json
@@ -4,13 +4,23 @@
         "core": "Cortex-M0",
         "extra_labels": [],
         "features": [],
-        "default_lib": "std"
+        "default_lib": "std",
+        "supported_c_libs": {
+                "arm": ["std"],
+                "gcc_arm": ["std", "small"],
+                "iar": ["std"]
+        }
     },
     "should_pass": {
         "supported_toolchains": ["GCC_ARM"],
         "core": "Cortex-M0",
         "extra_labels": [],
         "features": [],
-        "default_lib": "std"
+        "default_lib": "std",
+        "supported_c_libs": {
+                "arm": ["std"],
+                "gcc_arm": ["std", "small"],
+                "iar": ["std"]
+        }
     }
 }
diff --git a/tools/test/config/requires_from_lib/targets.json b/tools/test/config/requires_from_lib/targets.json
@@ -4,6 +4,11 @@
         "core": "Cortex-M0",
         "extra_labels": [],
         "features": [],
-        "default_lib": "std"
+        "default_lib": "std",
+        "supported_c_libs": {
+                "arm": ["std"],
+                "gcc_arm": ["std", "small"],
+                "iar": ["std"]
+        }
     }
 }
diff --git a/tools/test/config/requires_include_in_exclude/targets.json b/tools/test/config/requires_include_in_exclude/targets.json
@@ -4,13 +4,23 @@
         "core": "Cortex-M0",
         "extra_labels": [],
         "features": [],
-        "default_lib": "std"
+        "default_lib": "std",
+        "supported_c_libs": {
+                "arm": ["std"],
+                "gcc_arm": ["std", "small"],
+                "iar": ["std"]
+        }
     },
     "should_pass": {
         "supported_toolchains": ["GCC_ARM"],
         "core": "Cortex-M0",
         "extra_labels": [],
         "features": [],
-        "default_lib": "std"
+        "default_lib": "std",
+        "supported_c_libs": {
+                "arm": ["std"],
+                "gcc_arm": ["std", "small"],
+                "iar": ["std"]
+        }
     }
 }
diff --git a/tools/test/config/requires_omit_lib/targets.json b/tools/test/config/requires_omit_lib/targets.json
@@ -4,13 +4,23 @@
         "core": "Cortex-M0",
         "extra_labels": [],
         "features": [],
-        "default_lib": "std"
+        "default_lib": "std",
+        "supported_c_libs": {
+                "arm": ["std"],
+                "gcc_arm": ["std", "small"],
+                "iar": ["std"]
+        }
     },
     "should_pass": {
         "supported_toolchains": ["GCC_ARM"],
         "core": "Cortex-M0",
         "extra_labels": [],
         "features": [],
-        "default_lib": "std"
+        "default_lib": "std",
+        "supported_c_libs": {
+                "arm": ["std"],
+                "gcc_arm": ["std", "small"],
+                "iar": ["std"]
+        }
     }
 }
diff --git a/tools/test/config/simple_features/targets.json b/tools/test/config/simple_features/targets.json
@@ -4,6 +4,11 @@
         "core": "Cortex-M0",
         "extra_labels": [],
         "features": [],
-        "default_lib": "std"
+        "default_lib": "std",
+        "supported_c_libs": {
+                "arm": ["std"],
+                "gcc_arm": ["std", "small"],
+                "iar": ["std"]
+        }
     }
 }
diff --git a/tools/test/config/simple_iheritance/targets.json b/tools/test/config/simple_iheritance/targets.json
@@ -3,6 +3,11 @@
         "supported_toolchains": ["GCC_ARM"],
         "extra_labels": [],
         "default_lib": "std",
+        "supported_c_libs": {
+                "arm": ["std"],
+                "gcc_arm": ["std", "small"],
+                "iar": ["std"]
+        },
         "core": "Cortex-M0",
         "config": {
             "base1_1": "v_base1_1_b1",
diff --git a/tools/test/targets/target_test.py b/tools/test/targets/target_test.py
@@ -103,6 +103,11 @@ def test_modify_existing_target():
             "detect_code": [],
             "public": false,
             "default_lib": "std",
+            "supported_c_libs": {
+                "arm": ["std"],
+                "gcc_arm": ["std", "small"],
+                "iar": ["std"]
+            },
             "bootloader_supported": false
         },
         "Test_Target": {
@@ -113,7 +118,7 @@ def test_modify_existing_target():
     }"""
 
     test_target_json = """
-    { 
+    {
         "Target": {
             "core": "Cortex-M0",
             "default_toolchain": "GCC_ARM",
@@ -126,6 +131,11 @@ def test_modify_existing_target():
             "detect_code": [],
             "public": false,
             "default_lib": "std",
+            "supported_c_libs": {
+                "arm": ["std"],
+                "gcc_arm": ["std", "small"],
+                "iar": ["std"]
+            },
             "bootloader_supported": true
         }
     }
diff --git a/tools/test/toolchains/.includes_d41d8cd98f00b204e9800998ecf8427e.txt b/tools/test/toolchains/.includes_d41d8cd98f00b204e9800998ecf8427e.txt
diff --git a/tools/test/toolchains/asm_macros_d41d8cd98f00b204e9800998ecf8427e.xcl b/tools/test/toolchains/asm_macros_d41d8cd98f00b204e9800998ecf8427e.xcl

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,11 @@`
`4`	`4`	`"extra_labels": [],`
`5`	`5`	`"features": [],`
`6`	`6`	`"default_lib": "std",`
`7`		`- "supported_toolchains": ["GCC_ARM"]`
	`7`	`+ "supported_toolchains": ["GCC_ARM"],`
	`8`	`+ "supported_c_libs": {`
	`9`	`+ "arm": ["std"],`
	`10`	`+ "gcc_arm": ["std", "small"],`
	`11`	`+ "iar": ["std"]`
	`12`	`+ }`
`8`	`13`	`}`
`9`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,11 @@`
`4`	`4`	`"core": "Cortex-M0",`
`5`	`5`	`"extra_labels": [],`
`6`	`6`	`"features": [],`
`7`		`- "default_lib": "std"`
	`7`	`+ "default_lib": "std",`
	`8`	`+ "supported_c_libs": {`
	`9`	`+ "arm": ["std"],`
	`10`	`+ "gcc_arm": ["std", "small"],`
	`11`	`+ "iar": ["std"]`
	`12`	`+ }`
`8`	`13`	`}`
`9`	`14`	`}`