Update Greentea test configuration files

juhaylinen · Seppo Takalo · commit 83fdd131a2fe · 2018-05-25T09:38:22.000+03:00
Add .json files for WicedInterface and SpwfSAInterface
Add target configurations for
MTB_UBLOX_ODIN_W2
MTB_ADV_WISE_1530
MTB_USI_WM_BN_BM_22
MTB_MXCHIP_EMW3166
NUCLEO_F401RE
diff --git a/tools/test_configs/ESP8266Interface.json b/tools/test_configs/ESP8266Interface.json
@@ -8,8 +8,8 @@
             "value" : "new ESP8266Interface( D1, D0, false )"
         },
         "connect-statement" : {
-            "help" : "Must use 'net' variable name, replace WIFI_SSID, WIFI_PASSWORD, WIFI_SECURITY, WIFI_CHANNEL with your WiFi settings",
-            "value" : "((ESP8266Interface *)net)->connect(WIFI_SSID, WIFI_PASSWORD, WIFI_SECURITY, WIFI_CHANNEL)"
+            "help" : "Must use 'net' variable name, replace WIFI_SSID, WIFI_PASSWORD, WIFI_SECURITY with your WiFi settings",
+            "value" : "((ESP8266Interface *)net)->connect(WIFI_SSID, WIFI_PASSWORD, WIFI_SECURITY)"
         },
         "echo-server-addr" : {
             "help" : "IP address of echo server",
diff --git a/tools/test_configs/OdinInterface.json b/tools/test_configs/OdinInterface.json
@@ -13,15 +13,15 @@
         },
         "echo-server-addr" : {
             "help" : "IP address of echo server",
-            "value" : "\"dragon.u-blox.com\""
+            "value" : "\"echo.mbedcloudtesting.com\""
         },
         "echo-server-port" : {
             "help" : "Port of echo server",
             "value" : "7"
         },
         "tcp-echo-prefix" : {
             "help" : "Some servers send a prefix before echoed message",
-            "value" : "\"u-blox AG TCP/UDP test service\\n\""
+            "value" : null
         },
         "sim-blockdevice": {
             "help": "Simulated block device, requires sufficient heap",
diff --git a/tools/test_configs/Odin_EthernetInterface.json b/tools/test_configs/Odin_EthernetInterface.json
@@ -13,15 +13,15 @@
         },
         "echo-server-addr" : {
             "help" : "IP address of echo server",
-            "value" : "\"dragon.u-blox.com\""
+            "value" : "\"echo.mbedcloudtesting.com\""
         },
         "echo-server-port" : {
             "help" : "Port of echo server",
             "value" : "7"
         },
         "tcp-echo-prefix" : {
             "help" : "Some servers send a prefix before echoed message",
-            "value" : "\"u-blox AG TCP/UDP test service\\n\""
+            "value" : null
         },
         "sim-blockdevice": {
             "help": "Simulated block device, requires sufficient heap",
diff --git a/tools/test_configs/SpwfSAInterface.json b/tools/test_configs/SpwfSAInterface.json
@@ -0,0 +1,27 @@
+{
+    "config": {
+        "header-file": {
+            "help" : "String for including your driver header file",
+            "value" : "\"SpwfSAInterface.h\""
+        },
+        "object-construction" : {
+            "value" : "new SpwfSAInterface( D8, D2 )"
+        },
+        "connect-statement" : {
+            "help" : "Must use 'net' variable name, replace WIFI_SSID, WIFI_PASSWORD, WIFI_SECURITY with your WiFi settings",
+            "value" : "((SpwfSAInterface *)net)->connect(WIFI_SSID, WIFI_PASSWORD, WIFI_SECURITY)"
+        },
+        "echo-server-addr" : {
+            "help" : "IP address of echo server",
+            "value" : "\"echo.mbedcloudtesting.com\""
+        },
+        "echo-server-port" : {
+            "help" : "Port of echo server",
+            "value" : "7"
+        },
+        "tcp-echo-prefix" : {
+            "help" : "Some servers send a prefix before echoed message",
+            "value" : null
+        }
+    }
+}
diff --git a/tools/test_configs/WicedInterface.json b/tools/test_configs/WicedInterface.json
@@ -0,0 +1,46 @@
+{
+    "config": {
+        "header-file": {
+            "help" : "String for including your driver header file",
+            "value" : "\"WicedInterface.h\""
+        },
+        "object-construction" : {
+            "value" : "new WicedInterface()"
+        },
+        "connect-statement" : {
+            "help" : "Must use 'net' variable name, replace WIFI_SSID, WIFI_PASSWORD, WIFI_SECURITY with your WiFi settings",
+            "value" : "((WicedInterface *)net)->connect(WIFI_SSID, WIFI_PASSWORD, WIFI_SECURITY)"
+        },
+        "echo-server-addr" : {
+            "help" : "IP address of echo server",
+            "value" : "\"echo.mbedcloudtesting.com\""
+        },
+        "echo-server-port" : {
+            "help" : "Port of echo server",
+            "value" : "7"
+        },
+        "tcp-echo-prefix" : {
+            "help" : "Some servers send a prefix before echoed message",
+            "value" : null
+        },
+        "sim-blockdevice": {
+            "help": "Simulated block device, requires sufficient heap",
+            "macro_name": "MBED_TEST_SIM_BLOCKDEVICE",
+            "value": "HeapBlockDevice"
+        }
+    },
+    "target_overrides": {
+        "MTB_ADV_WISE_1530": {
+            "target.extra_labels_add": ["WICED"],
+            "target.features_add": ["BLE", "LWIP"]
+        },
+        "MTB_USI_WM_BN_BM_22": {
+            "target.extra_labels_add": ["WICED"],
+            "target.features_add": ["BLE", "LWIP"]
+        },
+        "MTB_MXCHIP_EMW3166": {
+            "target.extra_labels_add": ["WICED"],
+            "target.features_add": ["LWIP"]
+        }
+    }
+}
diff --git a/tools/test_configs/config_paths.json b/tools/test_configs/config_paths.json
@@ -5,5 +5,7 @@
     "ODIN_WIFI" : "OdinInterface.json",
     "ODIN_ETHERNET" : "Odin_EthernetInterface.json",
     "REALTEK_WIFI" : "RealtekInterface.json",	
-    "ESP8266_WIFI" : "ESP8266Interface.json"
+    "ESP8266_WIFI" : "ESP8266Interface.json",
+    "WICED_WIFI" : "WicedInterface.json",
+    "IDW0XX1_WIFI" : "SpwfSAInterface.json"
 }
diff --git a/tools/test_configs/target_configs.json b/tools/test_configs/target_configs.json
@@ -14,5 +14,25 @@
     "NUCLEO_F429ZI": {
         "default_test_configuration": "HEAPBLOCKDEVICE_AND_ETHERNET",
         "test_configurations": ["HEAPBLOCKDEVICE_AND_ETHERNET"]
+    },
+    "MTB_UBLOX_ODIN_W2": {
+        "default_test_configuration": "NONE",
+        "test_configurations": ["ODIN_WIFI"]
+    },
+    "MTB_ADV_WISE_1530": {
+        "default_test_configuration": "NONE",
+        "test_configurations": ["WICED_WIFI"]
+    },
+    "MTB_USI_WM_BN_BM_22": {
+        "default_test_configuration": "NONE",
+        "test_configurations": ["WICED_WIFI"]
+    },
+    "MTB_MXCHIP_EMW3166": {
+        "default_test_configuration": "NONE",
+        "test_configurations": ["WICED_WIFI"]
+    },
+    "NUCLEO_F401RE": {
+        "default_test_configuration": "NONE",
+        "test_configurations": ["IDW0XX1_WIFI"]
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,7 @@`
`5`	`5`	`"ODIN_WIFI" : "OdinInterface.json",`
`6`	`6`	`"ODIN_ETHERNET" : "Odin_EthernetInterface.json",`
`7`	`7`	`"REALTEK_WIFI" : "RealtekInterface.json",`
`8`		`- "ESP8266_WIFI" : "ESP8266Interface.json"`
	`8`	`+ "ESP8266_WIFI" : "ESP8266Interface.json",`
	`9`	`+ "WICED_WIFI" : "WicedInterface.json",`
	`10`	`+ "IDW0XX1_WIFI" : "SpwfSAInterface.json"`
`9`	`11`	`}`