Merge pull request #3930 from ARMmbed/release-candidate

Release candidate for mbed-os-5.4.1

Author: adbridge

drivers/FileSystemLike.h

@@ -114,7 +114,7 @@ class FileSystemLike : public FileBase {
      *    0 on success or un-needed,
      *   -1 on error
      */
-    virtual int stat(const char *name, struct stat *st) = 0;
+    virtual int stat(const char *name, struct stat *st) { return -1; };
 };
 
 } // namespace mbed

features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/hal_patch/sleep.c

@@ -66,6 +66,6 @@ void hal_sleep(void)
 
 void hal_deepsleep(void)
 {
-    sleep();
+    hal_sleep();
     //   NRF_POWER->SYSTEMOFF=1;
 }

features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/sdk/source/drivers_nrf/pstorage/config/pstorage_platform.h

@@ -66,7 +66,10 @@ static __INLINE uint32_t pstorage_flash_page_end()
 
 #define PSTORAGE_FLASH_PAGE_END     pstorage_flash_page_end()
 
+#ifndef PSTORAGE_NUM_OF_PAGES
 #define PSTORAGE_NUM_OF_PAGES       1                                                           /**< Number of flash pages allocated for the pstorage module excluding the swap page, configurable based on system requirements. */
+#endif
+
 #define PSTORAGE_MIN_BLOCK_SIZE     0x0010                                                      /**< Minimum size of block that can be registered with the module. Should be configured based on system requirements, recommendation is not have this value to be at least size of word. */
 
 #define PSTORAGE_DATA_START_ADDR    ((PSTORAGE_FLASH_PAGE_END - PSTORAGE_NUM_OF_PAGES - 1) \

features/FEATURE_LWIP/TESTS/mbedmicro-net/gethostbyname/main.cpp

@@ -91,7 +91,7 @@ void test_dns_literal_pref() {
 
 // Test setup
 utest::v1::status_t test_setup(const size_t number_of_cases) {
-    GREENTEA_SETUP(20, "default_auto");
+    GREENTEA_SETUP(60, "default_auto");
     net_bringup();
     return verbose_test_setup_handler(number_of_cases);
 }

features/FEATURE_LWIP/TESTS/mbedmicro-net/tcp_echo/main.cpp

@@ -29,7 +29,7 @@ void prep_buffer(char *tx_buffer, size_t tx_size) {
 }
 
 int main() {
-    GREENTEA_SETUP(20, "tcp_echo");
+    GREENTEA_SETUP(60, "tcp_echo");
 
     EthernetInterface eth;
     eth.connect();

features/FEATURE_LWIP/TESTS/mbedmicro-net/tcp_echo_parallel/main.cpp

@@ -88,7 +88,7 @@ Echo echoers[MBED_CFG_TCP_CLIENT_ECHO_THREADS];
 
 
 int main() {
-    GREENTEA_SETUP(20, "tcp_echo");
+    GREENTEA_SETUP(60, "tcp_echo");
 
     int err = net.connect();
     TEST_ASSERT_EQUAL(0, err);

features/FEATURE_LWIP/TESTS/mbedmicro-net/tcp_hello_world/main.cpp

@@ -36,7 +36,7 @@ bool find_substring(const char *first, const char *last, const char *s_first, co
 }
 
 int main() {
-    GREENTEA_SETUP(20, "default_auto");
+    GREENTEA_SETUP(60, "default_auto");
 
     bool result = false;
     EthernetInterface eth;

features/FEATURE_LWIP/TESTS/mbedmicro-net/udp_dtls_handshake/main.cpp

@@ -28,7 +28,7 @@ int udp_dtls_handshake_pattern[] = {MBED_CFG_UDP_DTLS_HANDSHAKE_PATTERN};
 const int udp_dtls_handshake_count = sizeof(udp_dtls_handshake_pattern) / sizeof(int);
 
 int main() {
-    GREENTEA_SETUP(20, "udp_shotgun");
+    GREENTEA_SETUP(60, "udp_shotgun");
 
     EthernetInterface eth;
     int err = eth.connect();

features/FEATURE_LWIP/TESTS/mbedmicro-net/udp_echo/main.cpp

@@ -34,7 +34,7 @@ void prep_buffer(char *tx_buffer, size_t tx_size) {
 }
 
 int main() {
-    GREENTEA_SETUP(20, "udp_echo");
+    GREENTEA_SETUP(60, "udp_echo");
 
     EthernetInterface eth;
     eth.connect();

features/FEATURE_LWIP/TESTS/mbedmicro-net/udp_echo_parallel/main.cpp

@@ -99,7 +99,7 @@ Echo echoers[MBED_CFG_UDP_CLIENT_ECHO_THREADS];
 
 
 int main() {
-    GREENTEA_SETUP(20, "udp_echo");
+    GREENTEA_SETUP(60, "udp_echo");
 
     int err = net.connect();
     TEST_ASSERT_EQUAL(0, err);