Adjust test configurations for EMAC

Make ETHERNET configuration the default if DEVICE_EMAC is present,
instead of if FEATURE_LWIP is present.

This limits it to targets which have been ported to the new EMAC API.

Add LWIP feature to JSON config, as in principle the targets shouldn't
be adding it themselves. Opens scope to having Nanostack-based tests.

Disable tests for the Realtek and Wifi drivers that aren't ported yet.
pull/6847/head
Kevin Bracey 2018-01-31 11:55:43 +02:00
parent b222c25435
commit 586a62a87b
6 changed files with 34 additions and 9 deletions

View File

@ -23,5 +23,11 @@
"help" : "Some servers send a prefix before echoed message",
"value" : "\"u-blox AG TCP/UDP test service\\n\""
}
},
"target_overrides": {
"*": {
"target.features_add": ["LWIP"],
"nsapi.default-stack": "LWIP"
}
}
}

View File

@ -28,5 +28,11 @@
"macro_name": "MBED_TEST_SIM_BLOCKDEVICE",
"value": "HeapBlockDevice"
}
},
"target_overrides": {
"*": {
"target.features_add": ["LWIP"],
"nsapi.default-stack": "LWIP"
}
}
}

View File

@ -8,8 +8,8 @@
"value" : "new OdinWiFiInterface()"
},
"connect-statement" : {
"help" : "Must use 'net' variable name",
"value" : "net->wifiInterface()->connect(WIFI_SSID, WIFI_PASSWORD)"
"help" : "Disabled until EMAC updated",
"value" : null
},
"echo-server-addr" : {
"help" : "IP address of echo server",
@ -28,5 +28,11 @@
"macro_name": "MBED_TEST_SIM_BLOCKDEVICE",
"value": "HeapBlockDevice"
}
},
"target_overrides": {
"*": {
"target.features_add": ["LWIP"],
"nsapi.default-stack": "LWIP"
}
}
}

View File

@ -29,9 +29,10 @@
"value": "HeapBlockDevice"
}
},
"target_overrides": {
"UBLOX_EVK_ODIN_W2": {
"target.device_has_remove": ["EMAC"]
"target_overrides": {
"*": {
"target.features_add": ["LWIP"],
"nsapi.default-stack": "LWIP"
}
}
}

View File

@ -8,8 +8,8 @@
"value" : "new RTWInterface()"
},
"connect-statement" : {
"help" : "Must use 'net' variable name, replace WIFI_SSID, WIFI_PASSWORD, WIFI_SECURITY, WIFI_CHANNEL with your WiFi settings",
"value" : "net->wifiInterface()->connect(WIFI_SSID, WIFI_PASSWORD, WIFI_SECURITY, WIFI_CHANNEL)"
"help" : "Disabled until EMAC updated",
"value" : null
},
"echo-server-addr" : {
"help" : "IP address of echo server",
@ -28,5 +28,11 @@
"macro_name": "MBED_TEST_SIM_BLOCKDEVICE",
"value": "HeapBlockDevice"
}
},
"target_overrides": {
"*": {
"target.features_add": ["LWIP"],
"nsapi.default-stack": "LWIP"
}
}
}

View File

@ -11,7 +11,7 @@ TARGET_CONFIGS = json_file_to_dict(join(CONFIG_DIR, "target_configs.json"))
def get_valid_configs(target_name):
if target_name in TARGET_CONFIGS:
target_config = TARGET_CONFIGS[target_name]
elif (target_name in TARGET_MAP and 'LWIP' in TARGET_MAP[target_name].features):
elif (target_name in TARGET_MAP and 'EMAC' in TARGET_MAP[target_name].device_has):
target_config = { "default_test_configuration": "ETHERNET", "test_configurations": ["ETHERNET"] }
else:
return {}
@ -37,7 +37,7 @@ def get_default_config(source_dir, target_name):
return join(CONFIG_DIR, CONFIG_MAP[config_name])
elif Config.find_app_config(source_dir):
return None
elif (target_name in TARGET_MAP and 'LWIP' in TARGET_MAP[target_name].features):
elif (target_name in TARGET_MAP and 'EMAC' in TARGET_MAP[target_name].device_has):
return join(CONFIG_DIR, CONFIG_MAP["ETHERNET"])
else:
return None