Skip to content

Commit 8ce8719

Browse files
committed
test configs: Test Experimental API on K64F/K66F
When using the `mbed test` command to build and run tests, some targets have additional configurations/overrides defined in `tools/test_configs/`: * `target_configs.json` lists which targets support which configs. * `config_paths.json` maps the name of each config to the JSON file to use. By default, only `default_test_configuration` from `target_configs.json` gets used when building and running tests. Others listed in `test_configuration` need to be switched via `--test-config <NAME>`. This commit enables Experimental API in the default configurations of K64F and K66F in order to test Mbed OS PSA. Any existing configs are kept, which is why `HeapBlockDeviceAndEthernetAndExperimental.json` is created for K64F.
1 parent 2d36341 commit 8ce8719

File tree

4 files changed

+52
-1
lines changed

4 files changed

+52
-1
lines changed
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
"config": {
3+
"echo-server-addr" : {
4+
"help" : "IP address of echo server",
5+
"value" : "\"echo.mbedcloudtesting.com\""
6+
},
7+
"echo-server-port" : {
8+
"help" : "Port of echo server",
9+
"value" : "7"
10+
},
11+
"echo-server-discard-port" : {
12+
"help" : "Discard port of echo server",
13+
"value" : "9"
14+
},
15+
"echo-server-port-tls" : {
16+
"help" : "Port of echo server for TLS",
17+
"value" : "2007"
18+
},
19+
"echo-server-discard-port-tls" : {
20+
"help" : "Discard port of echo server for TLS",
21+
"value" : "2009"
22+
},
23+
"sim-blockdevice": {
24+
"help": "Simulated block device, requires sufficient heap",
25+
"macro_name": "MBED_TEST_SIM_BLOCKDEVICE",
26+
"value": "HeapBlockDevice"
27+
}
28+
},
29+
"target_overrides": {
30+
"*": {
31+
"target.network-default-interface-type": "ETHERNET",
32+
"target.features_add": [
33+
"EXPERIMENTAL_API"
34+
]
35+
}
36+
}
37+
}

tools/test_configs/config_paths.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{
22
"ETHERNET" : "EthernetInterface.json",
3+
"EXPERIMENTAL": "experimental.json",
34
"HEAPBLOCKDEVICE": "HeapBlockDevice.json",
45
"HEAPBLOCKDEVICE_AND_ETHERNET": "HeapBlockDeviceAndEthernetInterface.json",
6+
"HEAPBLOCKDEVICE_AND_ETHERNET_AND_EXPERIMENTAL": "HeapBlockDeviceAndEthernetAndExperimental.json",
57
"HEAPBLOCKDEVICE_AND_WIFI": "HeapBlockDeviceAndWifiInterface.json",
68
"ESP8266_WIFI" : "ESP8266Interface.json",
79
"ISM43362_WIFI" : "ISM43362Interface.json",

tools/test_configs/experimental.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"target_overrides": {
3+
"*": {
4+
"target.features_add": [
5+
"EXPERIMENTAL_API"
6+
]
7+
}
8+
}
9+
}

tools/test_configs/target_configs.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
{
22
"K64F": {
3-
"default_test_configuration": "HEAPBLOCKDEVICE_AND_ETHERNET",
3+
"default_test_configuration": "HEAPBLOCKDEVICE_AND_ETHERNET_AND_EXPERIMENTAL",
44
"test_configurations": ["HEAPBLOCKDEVICE_AND_ETHERNET", "NANOSTACK_MAC_TESTER", "ESP8266_WIFI", "ETHERNET"]
55
},
6+
"K66F": {
7+
"default_test_configuration": "EXPERIMENTAL"
8+
},
69
"NUCLEO_F429ZI": {
710
"default_test_configuration": "HEAPBLOCKDEVICE_AND_ETHERNET",
811
"test_configurations": ["HEAPBLOCKDEVICE_AND_ETHERNET", "NANOSTACK_MAC_TESTER"]

0 commit comments

Comments
 (0)