Skip to content

Commit eb4a1fb

Browse files
theotherjimmyadbridge
theotherjimmy
authored and
adbridge
committed
Rename and simplify config test target names
1 parent 83913e3 commit eb4a1fb

File tree

13 files changed

+54
-65
lines changed

13 files changed

+54
-65
lines changed

‎tools/test/config/compound_inheritance/targets.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"b1": {
2+
"base": {
33
"extra_labels": [],
44
"default_lib": "std",
55
"core": "Cortex-M0",
@@ -9,8 +9,8 @@
99
"base1_3": "v_base1_3_b1"
1010
}
1111
},
12-
"d1": {
13-
"inherits": ["b1"],
12+
"left_middle": {
13+
"inherits": ["base"],
1414
"config": {
1515
"derived1": "v_derived1_d1",
1616
"derived2": "v_derived2_d1"
@@ -20,8 +20,8 @@
2020
"base1_2": "v_base1_2_d1"
2121
}
2222
},
23-
"b2": {
24-
"inherits": ["b1"],
23+
"right_middle": {
24+
"inherits": ["base"],
2525
"config": {
2626
"base2_1": "v_base2_1_b2",
2727
"base2_2": "v_base2_2_b2"
@@ -30,8 +30,8 @@
3030
"base1_2": "v_base1_2_b2"
3131
}
3232
},
33-
"f": {
34-
"inherits": ["d1", "b2"],
33+
"inherits_diamond": {
34+
"inherits": ["left_middle", "right_middle"],
3535
"config": {
3636
"f1_1": "v_f1_1_f",
3737
"f1_2": "v_f1_2_f"

‎tools/test/config/compound_inheritance/test_data.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"f": {
2+
"inherits_diamond": {
33
"target.base1_1": "v_base1_1_f",
44
"target.base1_2": "v_base1_2_b2",
55
"target.base1_3": "v_base1_3_b1",
@@ -10,7 +10,7 @@
1010
"target.f1_1": "v_f1_1_f_override",
1111
"target.f1_2": "v_f1_2_f"
1212
},
13-
"b2": {
13+
"right_middle": {
1414
"target.base1_1": "v_base1_1_b1",
1515
"target.base1_2": "v_base1_2_b2",
1616
"target.base1_3": "v_base1_3_b1",

‎tools/test/config/double_define/targets.json

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"b1": {
2+
"first_base": {
33
"extra_labels": [],
44
"default_lib": "std",
55
"core": "Cortex-M0",
@@ -9,18 +9,7 @@
99
"base1_3": "v_base1_3_b1"
1010
}
1111
},
12-
"d1": {
13-
"inherits": ["b1"],
14-
"config": {
15-
"derived1": "v_derived1_d1",
16-
"derived2": "v_derived2_d1"
17-
},
18-
"overrides": {
19-
"base1_1": "v_base1_1_d1",
20-
"base1_2": "v_base1_2_d1"
21-
}
22-
},
23-
"b2": {
12+
"second_base": {
2413
"extra_labels": [],
2514
"default_lib": "std",
2615
"core": "Cortex-M0",
@@ -30,8 +19,8 @@
3019
"base1_1": "v_base1_1_b2"
3120
}
3221
},
33-
"f": {
34-
"inherits": ["b2", "d1"],
22+
"double_config": {
23+
"inherits": ["first_base", "second_base"],
3524
"config": {
3625
"f1_1": "v_f1_1_f",
3726
"f1_2": "v_f1_2_f"

‎tools/test/config/double_define/test_data.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"f": {
3-
"exception_msg": "Parameter name 'base1_1' defined in both 'target:b2' and 'target:b1'"
2+
"double_config": {
3+
"exception_msg": "Parameter name 'base1_1' defined in both 'target:second_base' and 'target:first_base'"
44
},
5-
"b2": {
5+
"second_base": {
66
"target.base2_1": "v_base2_1_b2",
77
"target.base2_2": "v_base2_2_b2",
88
"target.base1_1": "v_base1_1_b2"

‎tools/test/config/override_undefined/targets.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"b1": {
2+
"first_base_target": {
33
"extra_labels": [],
44
"default_lib": "std",
55
"core": "Cortex-M0",
@@ -9,8 +9,8 @@
99
"base1_3": "v_base1_3_b1"
1010
}
1111
},
12-
"d1": {
13-
"inherits": ["b1"],
12+
"intermediate": {
13+
"inherits": ["first_base_target"],
1414
"config": {
1515
"derived1": "v_derived1_d1",
1616
"derived2": "v_derived2_d1"
@@ -20,7 +20,7 @@
2020
"base1_2": "v_base1_2_d1"
2121
}
2222
},
23-
"b2": {
23+
"second_base_target": {
2424
"config": {
2525
"base2_1": "v_base2_1_b2",
2626
"base2_2": "v_base2_2_b2"
@@ -29,8 +29,8 @@
2929
"base1_1": "v_base1_1_b2"
3030
}
3131
},
32-
"f": {
33-
"inherits": ["b2", "d1"],
32+
"should_fail": {
33+
"inherits": ["second_base_target", "intermediate"],
3434
"config": {
3535
"f1_1": "v_f1_1_f",
3636
"f1_2": "v_f1_2_f"

‎tools/test/config/override_undefined/test_data.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"f": {
3-
"exception_msg": "Attempt to override undefined parameter 'base1_1' in 'target:b2'"
2+
"should_fail": {
3+
"exception_msg": "Attempt to override undefined parameter 'base1_1' in 'target:second_base_target'"
44
},
5-
"d1": {
5+
"intermediate": {
66
"target.base1_1": "v_base1_1_d1",
77
"target.base1_2": "v_base1_2_d1",
88
"target.base1_3": "v_base1_3_b1",

‎tools/test/config/override_undefined_libs/targets.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
"default_lib": "std",
55
"core": "Cortex-M0"
66
},
7-
"b1": {
7+
"left_intermediate": {
88
"inherits": ["base"],
99
"extra_labels_add": ["b1_label"]
1010
},
11-
"b2": {
11+
"right_intermediate": {
1212
"inherits": ["base"],
1313
"extra_labels_add": ["b2_label"]
1414
},
1515
"both": {
16-
"inherits": ["b1", "b2"]
16+
"inherits": ["left_intermediate", "right_intermediate"]
1717
}
1818
}

‎tools/test/config/override_undefined_libs/test_data.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
"lib2.p1": "v_p1_lib2",
99
"lib2.p2": "v_p2_lib2"
1010
},
11-
"b1": {
11+
"left_intermediate": {
1212
"exception_msg": "Attempt to override undefined parameter 'app.app_wrong' in 'application[b1_label]"
1313
},
14-
"b2": {
14+
"right_intermediate": {
1515
"app.app1": "v_app1",
1616
"app.app2": "v_app2[b2_label]",
1717
"lib1.p1": "v_p1_lib1",

‎tools/test/config/override_with_labels/mbed_app.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"app2": "v_app2"
55
},
66
"target_overrides": {
7-
"b1_label": {
8-
"app1": "v_app1[b1_label]"
7+
"left_intermediate_label": {
8+
"app1": "v_app1[left_intermediate_label]"
99
},
10-
"b2_label": {
11-
"app2": "v_app2[b2_label]"
10+
"right_intermediate_label": {
11+
"app2": "v_app2[right_intermediate_label]"
1212
},
1313
"dummy_label": {
1414
"app1": "dummy.app1",

‎tools/test/config/override_with_labels/targets.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
"default_lib": "std",
55
"core": "Cortex-M0"
66
},
7-
"b1": {
7+
"left_intermediate": {
88
"inherits": ["base"],
9-
"extra_labels_add": ["b1_label"]
9+
"extra_labels_add": ["left_intermediate_label"]
1010
},
11-
"b2": {
11+
"right_intermediate": {
1212
"inherits": ["base"],
13-
"extra_labels_add": ["b2_label"]
13+
"extra_labels_add": ["right_intermediate_label"]
1414
},
1515
"both": {
16-
"inherits": ["b1", "b2"]
16+
"inherits": ["left_intermediate", "right_intermediate"]
1717
}
1818
}

‎tools/test/config/override_with_labels/test_data.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
2-
"b1": {
3-
"app.app1": "v_app1[b1_label]",
2+
"left_intermediate": {
3+
"app.app1": "v_app1[left_intermediate_label]",
44
"app.app2": "v_app2"
55
},
6-
"b2": {
6+
"right_intermediate": {
77
"app.app1": "v_app1",
8-
"app.app2": "v_app2[b2_label]"
8+
"app.app2": "v_app2[right_intermediate_label]"
99
},
1010
"both": {
11-
"app.app1": "v_app1[b1_label]",
12-
"app.app2": "v_app2[b2_label]"
11+
"app.app1": "v_app1[left_intermediate_label]",
12+
"app.app2": "v_app2[right_intermediate_label]"
1313
},
1414
"base": {
1515
"app.app1": "v_app1",

‎tools/test/config/simple_iheritance/targets.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"b1": {
2+
"first_base": {
33
"extra_labels": [],
44
"default_lib": "std",
55
"core": "Cortex-M0",
@@ -9,8 +9,8 @@
99
"base1_3": "v_base1_3_b1"
1010
}
1111
},
12-
"d1": {
13-
"inherits": ["b1"],
12+
"intermediate": {
13+
"inherits": ["first_base"],
1414
"config": {
1515
"derived1": "v_derived1_d1",
1616
"derived2": "v_derived2_d1"
@@ -20,14 +20,14 @@
2020
"base1_2": "v_base1_2_d1"
2121
}
2222
},
23-
"b2": {
23+
"second_base": {
2424
"config": {
2525
"base2_1": "v_base2_1_b2",
2626
"base2_2": "v_base2_2_b2"
2727
}
2828
},
29-
"f": {
30-
"inherits": ["b2", "d1"],
29+
"inherits_tree": {
30+
"inherits": ["second_base", "intermediate"],
3131
"config": {
3232
"f1_1": "v_f1_1_f",
3333
"f1_2": "v_f1_2_f"

‎tools/test/config/simple_iheritance/test_data.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"f": {
2+
"inherits_tree": {
33
"target.base1_1": "v_base1_1_f",
44
"target.base1_2": "v_base1_2_d1",
55
"target.base1_3": "v_base1_3_b1",
@@ -10,12 +10,12 @@
1010
"target.f1_1": "v_f1_1_f_override",
1111
"target.f1_2": "v_f1_2_f"
1212
},
13-
"b1": {
13+
"first_base": {
1414
"target.base1_1": "v_base1_1_b1",
1515
"target.base1_2": "v_base1_2_b1",
1616
"target.base1_3": "v_base1_3_b1"
1717
},
18-
"d1": {
18+
"intermediate": {
1919
"target.base1_1": "v_base1_1_d1",
2020
"target.base1_2": "v_base1_2_d1",
2121
"target.base1_3": "v_base1_3_b1",

0 commit comments

Comments
 (0)