Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix K64F-based config tests #1983

Merged
merged 1 commit into from
Jun 22, 2016
Merged

Fix K64F-based config tests #1983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion tools/test/config_test/test12/mbed_app.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion tools/test/config_test/test12/test_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 8 additions & 0 deletions tools/test/config_test/test16/mbed_app.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
{
"custom_targets": {
"test_target": {
"core": "Cortex-M0",
"extra_labels": [],
"features": [],
"default_build": "standard"
}
},
"macros": ["APP1=10", "APP2", "LIB2_1=5"]
}
2 changes: 1 addition & 1 deletion tools/test/config_test/test16/test_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
}
Expand Down
8 changes: 8 additions & 0 deletions tools/test/config_test/test21/mbed_app.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
{
"custom_targets": {
"test_target": {
"core": "Cortex-M0",
"extra_labels": [],
"features": [],
"default_build": "standard"
}
},
"target_overrides": {
"*": {
"target.features": ["IPV4", "IPV6"]
Expand Down
2 changes: 1 addition & 1 deletion tools/test/config_test/test21/test_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Testing basic features

expected_results = {
"K64F": {
"test_target": {
"desc": "test basic features",
"expected_features": ["IPV4", "IPV6"]
}
Expand Down
9 changes: 9 additions & 0 deletions tools/test/config_test/test22/mbed_app.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
{
"custom_targets": {
"test_target": {
"core": "Cortex-M0",
"extra_labels": [],
"features": [],
"default_build": "standard"
}
},
"target_overrides": {
"*": {
"target.features_add": ["IPV6"]
}
}
}

2 changes: 1 addition & 1 deletion tools/test/config_test/test22/test_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Testing when adding two features

expected_results = {
"K64F": {
"test_target": {
"desc": "test composing features",
"expected_features": ["IPV4", "IPV6"]
}
Expand Down
8 changes: 8 additions & 0 deletions tools/test/config_test/test24/mbed_app.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
{
"custom_targets": {
"test_target": {
"core": "Cortex-M0",
"extra_labels": [],
"features": [],
"default_build": "standard"
}
},
"target_overrides": {
"*": {
"target.features_add": ["IPV4"]
Expand Down
2 changes: 1 addition & 1 deletion tools/test/config_test/test24/test_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"]
}
Expand Down
8 changes: 8 additions & 0 deletions tools/test/config_test/test26/mbed_app.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
{
"custom_targets": {
"test_target": {
"core": "Cortex-M0",
"extra_labels": [],
"features": [],
"default_build": "standard"
}
},
"target_overrides": {
"*": {
"target.features_add": ["IPV4"],
Expand Down
2 changes: 1 addition & 1 deletion tools/test/config_test/test26/test_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
Expand Down