Merge pull request #5767 from ARMmbed/release-candidate

Release candidate for mbed-os-5.7.2

Author: 0xc0170

.travis.yml

@@ -188,3 +188,5 @@ matrix:
       env: NAME=mbed2-ATMEL
     - <<: *mbed-2
       env: NAME=mbed2-NUVOTON
+    - <<: *mbed-2
+      env: NAME=mbed2-RENESAS

TESTS/mbedmicro-rtos-mbed/heap_and_stack/main.cpp

@@ -16,7 +16,7 @@
  */
 
 #if defined(TARGET_CORTEX_A)
-　  #error [NOT_SUPPORTED] This function not supported for this target
+    #error [NOT_SUPPORTED] This function not supported for this target
 #endif
 
 #include <stdio.h>

TESTS/mbedmicro-rtos-mbed/malloc/main.cpp

@@ -32,7 +32,7 @@ volatile bool thread_should_continue = true;
 #define THREAD_MALLOC_SIZE  100
 
 #if defined(__CORTEX_A9)
-#define THREAD_STACK_SIZE   DEFAULT_STACK_SIZE
+#define THREAD_STACK_SIZE   512
 #else
 #define THREAD_STACK_SIZE   256
 #endif

TESTS/mbedmicro-rtos-mbed/threads/main.cpp

@@ -26,7 +26,11 @@
 #endif
 
 #define THREAD_STACK_SIZE 512
+#if defined(__CORTEX_A9)
+#define PARALLEL_THREAD_STACK_SIZE 512
+#else
 #define PARALLEL_THREAD_STACK_SIZE 384
+#endif
 #define CHILD_THREAD_STACK_SIZE 384
 
 using namespace utest::v1;

TESTS/network/wifi/get_interface.cpp

@@ -50,8 +50,10 @@ WiFiInterface *get_interface()
 {
     static WiFiInterface *interface = NULL;
 
-    if (interface)
-        delete interface;
+    if (interface) {
+        interface->disconnect();
+        return interface;
+    }
 
 #if MBED_CONF_APP_WIFI_DRIVER == INTERNAL
     interface = new DRIVER();

TESTS/network/wifi/get_security.cpp

@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2017, ARM Limited, All Rights Reserved
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <cstring>
+#include "mbed.h"
+#include "nsapi_types.h"
+
+nsapi_security get_security()
+{
+#if defined MBED_CONF_APP_WIFI_SECURE_PROTOCOL
+    static const char *SEC_WEP = "WEP";
+    static const char *SEC_WPA = "WPA";
+    static const char *SEC_WPA2 = "WPA2";
+    static const char *SEC_WPA_WPA2 = "WPA/WPA2";
+
+    if (strcmp(MBED_CONF_APP_WIFI_SECURE_PROTOCOL, SEC_WEP) == 0) {
+        return NSAPI_SECURITY_WEP;
+    }
+    if (strcmp(MBED_CONF_APP_WIFI_SECURE_PROTOCOL, SEC_WPA) == 0) {
+        return NSAPI_SECURITY_WPA;
+    }
+    if (strcmp(MBED_CONF_APP_WIFI_SECURE_PROTOCOL, SEC_WPA2) == 0) {
+        return NSAPI_SECURITY_WPA2;
+    }
+    if (strcmp(MBED_CONF_APP_WIFI_SECURE_PROTOCOL, SEC_WPA_WPA2) == 0) {
+        return NSAPI_SECURITY_WPA_WPA2;
+    }
+#endif
+    return NSAPI_SECURITY_NONE;
+}

TESTS/network/wifi/main.cpp

@@ -30,7 +30,8 @@
     !defined(MBED_CONF_APP_WIFI_PASSWORD)      || \
     !defined(MBED_CONF_APP_WIFI_RX)            || \
     !defined(MBED_CONF_APP_WIFI_SECURE_SSID)   || \
-    !defined(MBED_CONF_APP_WIFI_TX)
+    !defined(MBED_CONF_APP_WIFI_TX)            || \
+    !defined MBED_CONF_APP_WIFI_SECURE_PROTOCOL
 #error [NOT_SUPPORTED] Requires parameters from mbed_app.json (for secure connections)
 #endif
 #endif // defined(MBED_CONF_APP_WIFI_SECURE_SSID)
@@ -58,6 +59,7 @@ utest::v1::status_t test_setup(const size_t number_of_cases) {
 // Test cases
 Case cases[] = {
     Case("WIFI-CONSTRUCTOR", wifi_constructor),
+    Case("WIFI-CONNECT-NOCREDENTIALS", wifi_connect_nocredentials),
     Case("WIFI-SET-CREDENTIAL", wifi_set_credential),
     Case("WIFI-SET-CHANNEL", wifi_set_channel),
 #if defined(MBED_CONF_APP_WIFI_UNSECURE_SSID)
@@ -72,7 +74,6 @@ Case cases[] = {
     Case("WIFI-CONNECT-PARAMS-CHANNEL", wifi_connect_params_channel),
     Case("WIFI-CONNECT-PARAMS-CHANNEL-FAIL", wifi_connect_params_channel_fail),
 #endif
-    Case("WIFI-CONNECT-NOCREDENTIALS", wifi_connect_nocredentials),
 #if defined(MBED_CONF_APP_WIFI_UNSECURE_SSID)
     Case("WIFI-CONNECT", wifi_connect),
 #endif

TESTS/network/wifi/template_mbed_app.txt

@@ -12,6 +12,10 @@
             "help": "WiFi Password",
             "value": "\"PASSWORD\""
         },
+        "wifi-secure-protocol": {
+            "help": "WiFi security protocol, valid values are WEP, WPA, WPA2, WPA/WPA2",
+            "value": "\"WPA/WPA2\""
+        },
         "wifi-ch-secure": {
             "help": "Channel number of secure SSID",
             "value": 1

TESTS/network/wifi/wifi_connect_nocredentials.cpp

@@ -28,6 +28,5 @@ void wifi_connect_nocredentials(void)
     WiFiInterface *wifi = get_interface();
     nsapi_error_t error;
     error = wifi->connect();
-    wifi->disconnect();
-    TEST_ASSERT(error == NSAPI_ERROR_PARAMETER);
+    TEST_ASSERT(error == NSAPI_ERROR_NO_SSID || error == NSAPI_ERROR_PARAMETER);
 }

TESTS/network/wifi/wifi_connect_params_channel.cpp

@@ -34,7 +34,7 @@ void wifi_connect_params_channel(void)
         return;
     }
 
-    nsapi_error_t error = wifi->connect(MBED_CONF_APP_WIFI_SECURE_SSID, MBED_CONF_APP_WIFI_PASSWORD, NSAPI_SECURITY_WPA2, MBED_CONF_APP_WIFI_CH_SECURE);
+    nsapi_error_t error = wifi->connect(MBED_CONF_APP_WIFI_SECURE_SSID, MBED_CONF_APP_WIFI_PASSWORD, get_security(), MBED_CONF_APP_WIFI_CH_SECURE);
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, error);
 }