Fix K64F-based config tests

PR #1974 added a new configuration parameter to K64F, which in turn made
some tests break, because they found an unexpected configuration
parameter. Fixed by defining a special target for the tests
(test_target) that can be used independently of the actual mbed targets.
pull/1983/head
Bogdan Marinescu 2016-06-21 19:58:03 +03:00
parent 76c8be692c
commit 20583ba172
12 changed files with 56 additions and 7 deletions

View File

@ -1,6 +1,14 @@
{ {
"custom_targets": {
"test_target": {
"core": "Cortex-M0",
"extra_labels": [],
"features": [],
"default_build": "standard"
}
},
"target_overrides": { "target_overrides": {
"K64F": { "test_target": {
"lib1.p1": "v_p1_lib1_app", "lib1.p1": "v_p1_lib1_app",
"lib2.p1": "v_p1_lib2_app" "lib2.p1": "v_p1_lib2_app"
} }

View File

@ -3,7 +3,7 @@
# named p1 from both lib1 and lib2. # named p1 from both lib1 and lib2.
expected_results = { expected_results = {
"K64F": { "test_target": {
"desc": "app without its own parameters overrides parameters in other libs", "desc": "app without its own parameters overrides parameters in other libs",
"lib1.p1": "v_p1_lib1_app", "lib1.p1": "v_p1_lib1_app",
"lib1.p2": "v_p2_lib1", "lib1.p2": "v_p2_lib1",

View File

@ -1,3 +1,11 @@
{ {
"custom_targets": {
"test_target": {
"core": "Cortex-M0",
"extra_labels": [],
"features": [],
"default_build": "standard"
}
},
"macros": ["APP1=10", "APP2", "LIB2_1=5"] "macros": ["APP1=10", "APP2", "LIB2_1=5"]
} }

View File

@ -5,7 +5,7 @@
# no error should be raised # no error should be raised
expected_results = { expected_results = {
"K64F": { "test_target": {
"desc": "test macro definitions", "desc": "test macro definitions",
"expected_macros": ["APP1=10", "APP2", "LIB1_1=1","LIB1_2", "LIB2_1=5"] "expected_macros": ["APP1=10", "APP2", "LIB1_1=1","LIB1_2", "LIB2_1=5"]
} }

View File

@ -1,4 +1,12 @@
{ {
"custom_targets": {
"test_target": {
"core": "Cortex-M0",
"extra_labels": [],
"features": [],
"default_build": "standard"
}
},
"target_overrides": { "target_overrides": {
"*": { "*": {
"target.features": ["IPV4", "IPV6"] "target.features": ["IPV4", "IPV6"]

View File

@ -1,7 +1,7 @@
# Testing basic features # Testing basic features
expected_results = { expected_results = {
"K64F": { "test_target": {
"desc": "test basic features", "desc": "test basic features",
"expected_features": ["IPV4", "IPV6"] "expected_features": ["IPV4", "IPV6"]
} }

View File

@ -1,7 +1,16 @@
{ {
"custom_targets": {
"test_target": {
"core": "Cortex-M0",
"extra_labels": [],
"features": [],
"default_build": "standard"
}
},
"target_overrides": { "target_overrides": {
"*": { "*": {
"target.features_add": ["IPV6"] "target.features_add": ["IPV6"]
} }
} }
} }

View File

@ -1,7 +1,7 @@
# Testing when adding two features # Testing when adding two features
expected_results = { expected_results = {
"K64F": { "test_target": {
"desc": "test composing features", "desc": "test composing features",
"expected_features": ["IPV4", "IPV6"] "expected_features": ["IPV4", "IPV6"]
} }

View File

@ -1,4 +1,12 @@
{ {
"custom_targets": {
"test_target": {
"core": "Cortex-M0",
"extra_labels": [],
"features": [],
"default_build": "standard"
}
},
"target_overrides": { "target_overrides": {
"*": { "*": {
"target.features_add": ["IPV4"] "target.features_add": ["IPV4"]

View File

@ -1,7 +1,7 @@
# Testing if features can enable other features # Testing if features can enable other features
expected_results = { expected_results = {
"K64F": { "test_target": {
"desc": "test recursive features", "desc": "test recursive features",
"expected_features": ["IPV4", "IPV6", "UVISOR"] "expected_features": ["IPV4", "IPV6", "UVISOR"]
} }

View File

@ -1,4 +1,12 @@
{ {
"custom_targets": {
"test_target": {
"core": "Cortex-M0",
"extra_labels": [],
"features": [],
"default_build": "standard"
}
},
"target_overrides": { "target_overrides": {
"*": { "*": {
"target.features_add": ["IPV4"], "target.features_add": ["IPV4"],

View File

@ -1,7 +1,7 @@
# Testing if config settings work in recursive features # Testing if config settings work in recursive features
expected_results = { expected_results = {
"K64F": { "test_target": {
"desc": "test recursive feature configurations", "desc": "test recursive feature configurations",
"lib2.test": "GOOD" "lib2.test": "GOOD"
} }