Merge pull request #6201 from ARMmbed/release-candidate

Release candidate for mbed-os-5.7.6

Author: adbridge

.github/pull_request_template.md

@@ -1,39 +1,11 @@
-Notes:
-- Pull requests will not be accepted until the submitter has agreed to the [contributer agreement](https://github.com/ARMmbed/mbed-os/blob/master/CONTRIBUTING.md).
-- This is just a template, so feel free to use/remove the unnecessary things
+# Description
 
-## Description
+> Detailed changes summary | testing | dependencies
+> Good example: https://os.mbed.com/docs/latest/reference/guidelines.html#workflow (Pull request template)
 
-A few sentences describing the overall goals of the pull request's commits.
+# Pull request type
 
-## Status
-
-**READY/IN DEVELOPMENT/HOLD**
-
-## Migrations
-
-If this PR changes any APIs or behaviors, give a short description of what *API users* should do when this PR is merged.
-
-YES | NO
-
-## Related PRs
-
-List related PRs against other branches:
-
-branch | PR
------- | ------
-other_pr_production | [link]()
-other_pr_master | [link]()
-
-## Todos
-
-- [ ] Tests
-- [ ] Documentation
-
-## Deploy notes
-
-Notes regarding the deployment of this PR. These should note any required changes in the build environment, tools, compilers and so on.
-
-## Steps to test or reproduce
-
-Outline the steps to test or reproduce the PR here.
+- [ ] Fix
+- [ ] Refactor
+- [ ] New Target
+- [ ] Feature

.gitignore

@@ -16,6 +16,9 @@ BUILD/
 .mbed
 venv/
 
+# Mbedls
+.mbedls-mock.lock
+
 # Eclipse Project Files
 .cproject
 .project
@@ -44,6 +47,8 @@ pip-log.txt
 .coverage
 .tox
 nosetests.xml
+.cache
+.hypothesis
 
 # Translations
 *.mo
@@ -72,6 +77,9 @@ debug.log
 # Cscope
 cscope.*
 
+# Ctags
+tags
+
 # vim swap files
 *.swp
 *~

.travis.yml

@@ -5,7 +5,7 @@ python:
 env:
   global:
     - >
-      STATUS=$'curl -so/dev/null --user $MBED_BOT --request POST
+      STATUS=$'curl -so/dev/null --user "$MBED_BOT" --request POST
       https://api.github.com/repos/$TRAVIS_REPO_SLUG/statuses/${TRAVIS_PULL_REQUEST_SHA:-$TRAVIS_COMMIT}
       --data @- << DATA\n{
       "state": "$0",
@@ -30,7 +30,8 @@ before_install:
   - sudo ln -s $HOME/.cache/apt /var/cache/apt/archives
   # Setup ppa to make sure arm-none-eabi-gcc is correct version
   - sudo add-apt-repository -y ppa:team-gcc-arm-embedded/ppa
-  - sudo apt-get update -qq
+  # Loop until update succeeds (timeouts can occur)
+  - while [ -n "$(sudo apt-get update 2>&1 |grep Failed)" ]; do :; done
 
 after_success:
   - bash -c "$STATUS" success "Local $NAME testing has passed"
@@ -108,6 +109,10 @@ matrix:
         # Check that example compiles
         - sed -n '/``` cpp/,/```/{/```$/Q;/```/d;p;}' $EVENTS/README.md > main.cpp
         - python tools/make.py -t GCC_ARM -m K64F --source=. --build=BUILD/K64F/GCC_ARM -j0
+        # Check that example compiles without rtos
+        - sed -n '/``` cpp/,/```/{/```$/Q;/```/d;p;}' $EVENTS/README.md > main.cpp
+        - rm -r rtos features/netsocket features/frameworks BUILD
+        - python tools/make.py -t GCC_ARM -m DISCO_F401VC --source=. --build=BUILD/DISCO_F401VC/GCC_ARM -j0
         # Run local equeue tests
         - make -C $EVENTS/equeue test
 

TESTS/events/timing/main.cpp

@@ -107,7 +107,10 @@ void semaphore_timing_test() {
         equeue_sema_wait(&sema, delay);
         int taken = timer.read_us() - start;
 
-        printf("delay %dms => error %dus\r\n", delay, abs(1000*delay - taken));
+        if (taken < (delay * 1000 - 5000) || taken > (delay * 1000 + 5000)) {
+            printf("delay %dms => error %dus\r\n", delay, abs(1000 * delay - taken));
+        }
+
         TEST_ASSERT_INT_WITHIN(5000, taken, delay * 1000);
 
         led = !led;

TESTS/mbed_hal/sleep_manager_racecondition/main.cpp

@@ -67,12 +67,12 @@ void sleep_manager_irq_test()
         Ticker ticker1;
         Timer timer;
 
-        ticker1.attach_us(&sleep_manager_locking_irq_test, 500);
+        ticker1.attach_us(&sleep_manager_locking_irq_test, 1000);
 
-        // run this for 5 seconds
+        // run this for 10 seconds
         timer.start();
         int start = timer.read();
-        int end = start + 5;
+        int end = start + 10;
         while (timer.read() < end) {
             sleep_manager_locking_irq_test();
         }

TESTS/netsocket/tcp_echo/main.cpp

@@ -16,7 +16,7 @@
  */
 
 #ifndef MBED_CONF_APP_CONNECT_STATEMENT
-    #error [NOT_SUPPORTED] No network configuration found for this target.
+#error [NOT_SUPPORTED] No network configuration found for this target.
 #endif
 
 #include "mbed.h"
@@ -32,18 +32,21 @@ using namespace utest::v1;
 #define MBED_CONF_APP_TCP_CLIENT_ECHO_BUFFER_SIZE 256
 #endif
 
-namespace {
-    char tx_buffer[MBED_CONF_APP_TCP_CLIENT_ECHO_BUFFER_SIZE] = {0};
-    char rx_buffer[MBED_CONF_APP_TCP_CLIENT_ECHO_BUFFER_SIZE] = {0};
+namespace
+{
+char tx_buffer[MBED_CONF_APP_TCP_CLIENT_ECHO_BUFFER_SIZE] = {0};
+char rx_buffer[MBED_CONF_APP_TCP_CLIENT_ECHO_BUFFER_SIZE] = {0};
 }
 
-void prep_buffer(char *tx_buffer, size_t tx_size) {
-    for (size_t i=0; i<tx_size; ++i) {
+void prep_buffer(char *tx_buffer, size_t tx_size)
+{
+    for (size_t i = 0; i < tx_size; ++i) {
         tx_buffer[i] = (rand() % 10) + '0';
     }
 }
 
-void test_tcp_echo() {
+void test_tcp_echo()
+{
     int n = 0;
     NetworkInterface* net = MBED_CONF_APP_OBJECT_CONSTRUCTION;
     int err =  MBED_CONF_APP_CONNECT_STATEMENT;
@@ -119,7 +122,8 @@ void test_tcp_echo() {
 
 
 // Test setup
-utest::v1::status_t test_setup(const size_t number_of_cases) {
+utest::v1::status_t test_setup(const size_t number_of_cases)
+{
     GREENTEA_SETUP(240, "tcp_echo");
     return verbose_test_setup_handler(number_of_cases);
 }
@@ -130,6 +134,7 @@ Case cases[] = {
 
 Specification specification(test_setup, cases);
 
-int main() {
+int main()
+{
     return !Harness::run(specification);
 }

TESTS/netsocket/tcp_echo_parallel/main.cpp

@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
- #ifndef MBED_CONF_APP_CONNECT_STATEMENT
-     #error [NOT_SUPPORTED] No network configuration found for this target.
- #endif
+#ifndef MBED_CONF_APP_CONNECT_STATEMENT
+#error [NOT_SUPPORTED] No network configuration found for this target.
+#endif
 
 #ifndef MBED_EXTENDED_TESTS
-    #error [NOT_SUPPORTED] Parallel tests are not supported by default
+#error [NOT_SUPPORTED] Parallel tests are not supported by default
 #endif
 
 #include "mbed.h"
@@ -33,12 +33,12 @@
 using namespace utest::v1;
 
 
-#ifndef MBED_CFG_TCP_CLIENT_ECHO_BUFFER_SIZE
-#define MBED_CFG_TCP_CLIENT_ECHO_BUFFER_SIZE 64
+#ifndef MBED_CONF_APP_TCP_CLIENT_ECHO_BUFFER_SIZE
+#define MBED_CONF_APP_TCP_CLIENT_ECHO_BUFFER_SIZE 64
 #endif
 
-#ifndef MBED_CFG_TCP_CLIENT_ECHO_THREADS
-#define MBED_CFG_TCP_CLIENT_ECHO_THREADS 3
+#ifndef MBED_CONF_APP_TCP_CLIENT_ECHO_THREADS
+#define MBED_CONF_APP_TCP_CLIENT_ECHO_THREADS 3
 #endif
 
 #define STRINGIZE(x) STRINGIZE2(x)
@@ -49,51 +49,59 @@ NetworkInterface* net;
 SocketAddress tcp_addr;
 Mutex iomutex;
 
-void prep_buffer(char *tx_buffer, size_t tx_size) {
-    for (size_t i=0; i<tx_size; ++i) {
+void prep_buffer(char *tx_buffer, size_t tx_size)
+{
+    for (size_t i = 0; i < tx_size; ++i) {
         tx_buffer[i] = (rand() % 10) + '0';
     }
 }
 
 
 // Each echo class is in charge of one parallel transaction
-class Echo {
+class Echo
+{
 private:
-    char tx_buffer[MBED_CFG_TCP_CLIENT_ECHO_BUFFER_SIZE];
-    char rx_buffer[MBED_CFG_TCP_CLIENT_ECHO_BUFFER_SIZE];
+    char tx_buffer[MBED_CONF_APP_TCP_CLIENT_ECHO_BUFFER_SIZE];
+    char rx_buffer[MBED_CONF_APP_TCP_CLIENT_ECHO_BUFFER_SIZE];
 
     TCPSocket sock;
     Thread thread;
 
 public:
     // Limiting stack size to 1k
-    Echo(): thread(osPriorityNormal, 1024) {
+    Echo(): thread(osPriorityNormal, 1024)
+    {
     }
 
-    void start() {
+    void start()
+    {
         osStatus status = thread.start(callback(this, &Echo::echo));
         TEST_ASSERT_EQUAL(osOK, status);
     }
 
-    void join() {
+    void join()
+    {
         osStatus status = thread.join();
         TEST_ASSERT_EQUAL(osOK, status);
     }
 
-    void echo() {
+    void echo()
+    {
         int err = sock.open(net);
         TEST_ASSERT_EQUAL(0, err);
 
         err = sock.connect(tcp_addr);
         TEST_ASSERT_EQUAL(0, err);
 
+#if defined(MBED_CONF_APP_TCP_ECHO_PREFIX)
         //recv connection prefix message
         sock.recv(rx_buffer, sizeof(MBED_CONF_APP_TCP_ECHO_PREFIX));
+#endif /* MBED_CONF_APP_TCP_ECHO_PREFIX */
         memset(rx_buffer, 0, sizeof(rx_buffer));
 
         iomutex.lock();
         printf("HTTP: Connected to %s:%d\r\n",
-                tcp_addr.get_ip_address(), tcp_addr.get_port());
+               tcp_addr.get_ip_address(), tcp_addr.get_port());
         printf("tx_buffer buffer size: %u\r\n", sizeof(tx_buffer));
         printf("rx_buffer buffer size: %u\r\n", sizeof(rx_buffer));
         iomutex.unlock();
@@ -112,26 +120,45 @@ class Echo {
     }
 };
 
-Echo *echoers[MBED_CFG_TCP_CLIENT_ECHO_THREADS];
+Echo *echoers[MBED_CONF_APP_TCP_CLIENT_ECHO_THREADS];
 
 
-void test_tcp_echo_parallel() {
+void test_tcp_echo_parallel()
+{
     net = MBED_CONF_APP_OBJECT_CONSTRUCTION;
     int err =  MBED_CONF_APP_CONNECT_STATEMENT;
     TEST_ASSERT_EQUAL(0, err);
 
     printf("MBED: TCPClient IP address is '%s'\n", net->get_ip_address());
 
+#if defined(MBED_CONF_APP_ECHO_SERVER_ADDR) && defined(MBED_CONF_APP_ECHO_SERVER_PORT)
     tcp_addr.set_ip_address(MBED_CONF_APP_ECHO_SERVER_ADDR);
     tcp_addr.set_port(MBED_CONF_APP_ECHO_SERVER_PORT);
+#else /* MBED_CONF_APP_ECHO_SERVER_ADDR && MBED_CONF_APP_ECHO_SERVER_PORT */
+    char recv_key[] = "host_port";
+    char ipbuf[60] = {0};
+    char portbuf[16] = {0};
+    unsigned int port = 0;
+
+    greentea_send_kv("target_ip", net->get_ip_address());
+    greentea_send_kv("host_ip", " ");
+    greentea_parse_kv(recv_key, ipbuf, sizeof(recv_key), sizeof(ipbuf));
+
+    greentea_send_kv("host_port", " ");
+    greentea_parse_kv(recv_key, portbuf, sizeof(recv_key), sizeof(ipbuf));
+    sscanf(portbuf, "%u", &port);
+
+    tcp_addr.set_ip_address(ipbuf);
+    tcp_addr.set_port(port);
+#endif /* MBED_CONF_APP_ECHO_SERVER_ADDR && MBED_CONF_APP_ECHO_SERVER_PORT */
 
     // Startup echo threads in parallel
-    for (int i = 0; i < MBED_CFG_TCP_CLIENT_ECHO_THREADS; i++) {
+    for (int i = 0; i < MBED_CONF_APP_TCP_CLIENT_ECHO_THREADS; i++) {
         echoers[i] = new Echo;
         echoers[i]->start();
     }
 
-    for (int i = 0; i < MBED_CFG_TCP_CLIENT_ECHO_THREADS; i++) {
+    for (int i = 0; i < MBED_CONF_APP_TCP_CLIENT_ECHO_THREADS; i++) {
         echoers[i]->join();
         delete echoers[i];
     }
@@ -140,7 +167,8 @@ void test_tcp_echo_parallel() {
 }
 
 // Test setup
-utest::v1::status_t test_setup(const size_t number_of_cases) {
+utest::v1::status_t test_setup(const size_t number_of_cases)
+{
     GREENTEA_SETUP(120, "tcp_echo");
     return verbose_test_setup_handler(number_of_cases);
 }
@@ -151,6 +179,7 @@ Case cases[] = {
 
 Specification specification(test_setup, cases);
 
-int main() {
+int main()
+{
     return !Harness::run(specification);
 }