ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename and simplify config test target names

pull/4984/head
Jimmy Brisson 2017-09-05 15:21:08 -05:00
parent 399b6acfb1
commit 9d0e8abb11
13 changed files with 54 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/test/config/compound_inheritance/targets.json
View File

@ -1,5 +1,5 @@
{ {
"b1": { "base": {
"extra_labels": [], "extra_labels": [],
"default_lib": "std", "default_lib": "std",
"core": "Cortex-M0", "core": "Cortex-M0",
@ -9,8 +9,8 @@
"base1_3": "v_base1_3_b1" "base1_3": "v_base1_3_b1"
} }
}, },
"d1": { "left_middle": {
"inherits": ["b1"], "inherits": ["base"],
"config": { "config": {
"derived1": "v_derived1_d1", "derived1": "v_derived1_d1",
"derived2": "v_derived2_d1" "derived2": "v_derived2_d1"
@ -20,8 +20,8 @@
"base1_2": "v_base1_2_d1" "base1_2": "v_base1_2_d1"
} }
}, },
"b2": { "right_middle": {
"inherits": ["b1"], "inherits": ["base"],
"config": { "config": {
"base2_1": "v_base2_1_b2", "base2_1": "v_base2_1_b2",
"base2_2": "v_base2_2_b2" "base2_2": "v_base2_2_b2"
@ -30,8 +30,8 @@
"base1_2": "v_base1_2_b2" "base1_2": "v_base1_2_b2"
} }
}, },
"f": { "inherits_diamond": {
"inherits": ["d1", "b2"], "inherits": ["left_middle", "right_middle"],
"config": { "config": {
"f1_1": "v_f1_1_f", "f1_1": "v_f1_1_f",
"f1_2": "v_f1_2_f" "f1_2": "v_f1_2_f"

4
tools/test/config/compound_inheritance/test_data.json
View File

@ -1,5 +1,5 @@
{ {
"f": { "inherits_diamond": {
"target.base1_1": "v_base1_1_f", "target.base1_1": "v_base1_1_f",
"target.base1_2": "v_base1_2_b2", "target.base1_2": "v_base1_2_b2",
"target.base1_3": "v_base1_3_b1", "target.base1_3": "v_base1_3_b1",
@ -10,7 +10,7 @@
"target.f1_1": "v_f1_1_f_override", "target.f1_1": "v_f1_1_f_override",
"target.f1_2": "v_f1_2_f" "target.f1_2": "v_f1_2_f"
}, },
"b2": { "right_middle": {
"target.base1_1": "v_base1_1_b1", "target.base1_1": "v_base1_1_b1",
"target.base1_2": "v_base1_2_b2", "target.base1_2": "v_base1_2_b2",
"target.base1_3": "v_base1_3_b1", "target.base1_3": "v_base1_3_b1",

19
tools/test/config/double_define/targets.json
View File

@ -1,5 +1,5 @@
{ {
"b1": { "first_base": {
"extra_labels": [], "extra_labels": [],
"default_lib": "std", "default_lib": "std",
"core": "Cortex-M0", "core": "Cortex-M0",
@ -9,18 +9,7 @@
"base1_3": "v_base1_3_b1" "base1_3": "v_base1_3_b1"
} }
}, },
"d1": { "second_base": {
"inherits": ["b1"],
"config": {
"derived1": "v_derived1_d1",
"derived2": "v_derived2_d1"
},
"overrides": {
"base1_1": "v_base1_1_d1",
"base1_2": "v_base1_2_d1"
}
},
"b2": {
"extra_labels": [], "extra_labels": [],
"default_lib": "std", "default_lib": "std",
"core": "Cortex-M0", "core": "Cortex-M0",
@ -30,8 +19,8 @@
"base1_1": "v_base1_1_b2" "base1_1": "v_base1_1_b2"
} }
}, },
"f": { "double_config": {
"inherits": ["b2", "d1"], "inherits": ["first_base", "second_base"],
"config": { "config": {
"f1_1": "v_f1_1_f", "f1_1": "v_f1_1_f",
"f1_2": "v_f1_2_f" "f1_2": "v_f1_2_f"

6
tools/test/config/double_define/test_data.json
View File

@ -1,8 +1,8 @@
{ {
"f": { "double_config": {
"exception_msg": "Parameter name 'base1_1' defined in both 'target:b2' and 'target:b1'" "exception_msg": "Parameter name 'base1_1' defined in both 'target:second_base' and 'target:first_base'"
}, },
"b2": { "second_base": {
"target.base2_1": "v_base2_1_b2", "target.base2_1": "v_base2_1_b2",
"target.base2_2": "v_base2_2_b2", "target.base2_2": "v_base2_2_b2",
"target.base1_1": "v_base1_1_b2" "target.base1_1": "v_base1_1_b2"

12
tools/test/config/override_undefined/targets.json
View File

@ -1,5 +1,5 @@
{ {
"b1": { "first_base_target": {
"extra_labels": [], "extra_labels": [],
"default_lib": "std", "default_lib": "std",
"core": "Cortex-M0", "core": "Cortex-M0",
@ -9,8 +9,8 @@
"base1_3": "v_base1_3_b1" "base1_3": "v_base1_3_b1"
} }
}, },
"d1": { "intermediate": {
"inherits": ["b1"], "inherits": ["first_base_target"],
"config": { "config": {
"derived1": "v_derived1_d1", "derived1": "v_derived1_d1",
"derived2": "v_derived2_d1" "derived2": "v_derived2_d1"
@ -20,7 +20,7 @@
"base1_2": "v_base1_2_d1" "base1_2": "v_base1_2_d1"
} }
}, },
"b2": { "second_base_target": {
"config": { "config": {
"base2_1": "v_base2_1_b2", "base2_1": "v_base2_1_b2",
"base2_2": "v_base2_2_b2" "base2_2": "v_base2_2_b2"
@ -29,8 +29,8 @@
"base1_1": "v_base1_1_b2" "base1_1": "v_base1_1_b2"
} }
}, },
"f": { "should_fail": {
"inherits": ["b2", "d1"], "inherits": ["second_base_target", "intermediate"],
"config": { "config": {
"f1_1": "v_f1_1_f", "f1_1": "v_f1_1_f",
"f1_2": "v_f1_2_f" "f1_2": "v_f1_2_f"

6
tools/test/config/override_undefined/test_data.json
View File

@ -1,8 +1,8 @@
{ {
"f": { "should_fail": {
"exception_msg": "Attempt to override undefined parameter 'base1_1' in 'target:b2'" "exception_msg": "Attempt to override undefined parameter 'base1_1' in 'target:second_base_target'"
}, },
"d1": { "intermediate": {
"target.base1_1": "v_base1_1_d1", "target.base1_1": "v_base1_1_d1",
"target.base1_2": "v_base1_2_d1", "target.base1_2": "v_base1_2_d1",
"target.base1_3": "v_base1_3_b1", "target.base1_3": "v_base1_3_b1",

6
tools/test/config/override_undefined_libs/targets.json
View File

@ -4,15 +4,15 @@
"default_lib": "std", "default_lib": "std",
"core": "Cortex-M0" "core": "Cortex-M0"
}, },
"b1": { "left_intermediate": {
"inherits": ["base"], "inherits": ["base"],
"extra_labels_add": ["b1_label"] "extra_labels_add": ["b1_label"]
}, },
"b2": { "right_intermediate": {
"inherits": ["base"], "inherits": ["base"],
"extra_labels_add": ["b2_label"] "extra_labels_add": ["b2_label"]
}, },
"both": { "both": {
"inherits": ["b1", "b2"] "inherits": ["left_intermediate", "right_intermediate"]
} }
} }

4
tools/test/config/override_undefined_libs/test_data.json
View File

@ -8,10 +8,10 @@
"lib2.p1": "v_p1_lib2", "lib2.p1": "v_p1_lib2",
"lib2.p2": "v_p2_lib2" "lib2.p2": "v_p2_lib2"
}, },
"b1": { "left_intermediate": {
"exception_msg": "Attempt to override undefined parameter 'app.app_wrong' in 'application[b1_label]" "exception_msg": "Attempt to override undefined parameter 'app.app_wrong' in 'application[b1_label]"
}, },
"b2": { "right_intermediate": {
"app.app1": "v_app1", "app.app1": "v_app1",
"app.app2": "v_app2[b2_label]", "app.app2": "v_app2[b2_label]",
"lib1.p1": "v_p1_lib1", "lib1.p1": "v_p1_lib1",

8
tools/test/config/override_with_labels/mbed_app.json
View File

@ -4,11 +4,11 @@
"app2": "v_app2" "app2": "v_app2"
}, },
"target_overrides": { "target_overrides": {
"b1_label": { "left_intermediate_label": {
"app1": "v_app1[b1_label]" "app1": "v_app1[left_intermediate_label]"
}, },
"b2_label": { "right_intermediate_label": {
"app2": "v_app2[b2_label]" "app2": "v_app2[right_intermediate_label]"
}, },
"dummy_label": { "dummy_label": {
"app1": "dummy.app1", "app1": "dummy.app1",

10
tools/test/config/override_with_labels/targets.json
View File

@ -4,15 +4,15 @@
"default_lib": "std", "default_lib": "std",
"core": "Cortex-M0" "core": "Cortex-M0"
}, },
"b1": { "left_intermediate": {
"inherits": ["base"], "inherits": ["base"],
"extra_labels_add": ["b1_label"] "extra_labels_add": ["left_intermediate_label"]
}, },
"b2": { "right_intermediate": {
"inherits": ["base"], "inherits": ["base"],
"extra_labels_add": ["b2_label"] "extra_labels_add": ["right_intermediate_label"]
}, },
"both": { "both": {
"inherits": ["b1", "b2"] "inherits": ["left_intermediate", "right_intermediate"]
} }
} }

12
tools/test/config/override_with_labels/test_data.json
View File

@ -1,15 +1,15 @@
{ {
"b1": { "left_intermediate": {
"app.app1": "v_app1[b1_label]", "app.app1": "v_app1[left_intermediate_label]",
"app.app2": "v_app2" "app.app2": "v_app2"
}, },
"b2": { "right_intermediate": {
"app.app1": "v_app1", "app.app1": "v_app1",
"app.app2": "v_app2[b2_label]" "app.app2": "v_app2[right_intermediate_label]"
}, },
"both": { "both": {
"app.app1": "v_app1[b1_label]", "app.app1": "v_app1[left_intermediate_label]",
"app.app2": "v_app2[b2_label]" "app.app2": "v_app2[right_intermediate_label]"
}, },
"base": { "base": {
"app.app1": "v_app1", "app.app1": "v_app1",

12
tools/test/config/simple_iheritance/targets.json
View File

@ -1,5 +1,5 @@
{ {
"b1": { "first_base": {
"extra_labels": [], "extra_labels": [],
"default_lib": "std", "default_lib": "std",
"core": "Cortex-M0", "core": "Cortex-M0",
@ -9,8 +9,8 @@
"base1_3": "v_base1_3_b1" "base1_3": "v_base1_3_b1"
} }
}, },
"d1": { "intermediate": {
"inherits": ["b1"], "inherits": ["first_base"],
"config": { "config": {
"derived1": "v_derived1_d1", "derived1": "v_derived1_d1",
"derived2": "v_derived2_d1" "derived2": "v_derived2_d1"
@ -20,14 +20,14 @@
"base1_2": "v_base1_2_d1" "base1_2": "v_base1_2_d1"
} }
}, },
"b2": { "second_base": {
"config": { "config": {
"base2_1": "v_base2_1_b2", "base2_1": "v_base2_1_b2",
"base2_2": "v_base2_2_b2" "base2_2": "v_base2_2_b2"
} }
}, },
"f": { "inherits_tree": {
"inherits": ["b2", "d1"], "inherits": ["second_base", "intermediate"],
"config": { "config": {
"f1_1": "v_f1_1_f", "f1_1": "v_f1_1_f",
"f1_2": "v_f1_2_f" "f1_2": "v_f1_2_f"

6
tools/test/config/simple_iheritance/test_data.json
View File

@ -1,5 +1,5 @@
{ {
"f": { "inherits_tree": {
"target.base1_1": "v_base1_1_f", "target.base1_1": "v_base1_1_f",
"target.base1_2": "v_base1_2_d1", "target.base1_2": "v_base1_2_d1",
"target.base1_3": "v_base1_3_b1", "target.base1_3": "v_base1_3_b1",
@ -10,12 +10,12 @@
"target.f1_1": "v_f1_1_f_override", "target.f1_1": "v_f1_1_f_override",
"target.f1_2": "v_f1_2_f" "target.f1_2": "v_f1_2_f"
}, },
"b1": { "first_base": {
"target.base1_1": "v_base1_1_b1", "target.base1_1": "v_base1_1_b1",
"target.base1_2": "v_base1_2_b1", "target.base1_2": "v_base1_2_b1",
"target.base1_3": "v_base1_3_b1" "target.base1_3": "v_base1_3_b1"
}, },
"d1": { "intermediate": {
"target.base1_1": "v_base1_1_d1", "target.base1_1": "v_base1_1_d1",
"target.base1_2": "v_base1_2_d1", "target.base1_2": "v_base1_2_d1",
"target.base1_3": "v_base1_3_b1", "target.base1_3": "v_base1_3_b1",