Merge pull request #6461 from ARMmbed/release-candidate

Release candidate for mbed-os-5.8.1
ARMmbed · Mar 27, 2018 · addec7b · addec7b
2 parents ad284b2 + a48b62d
commit addec7b
Show file tree

Hide file tree

Showing 289 changed files with 22,188 additions and 19,205 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -11,11 +11,17 @@
 
 <!-- 
     Required
-    Please tick one of the following types 
+    Please tick only one of the following types. Do not tick more or change the layout.
+
+    [X] Fix
+    [ ] Refactor
+    [ ] New target
+    [ ] Feature
+    [ ] Breaking change
 -->
 
-- [ ] Fix
-- [ ] Refactor
-- [ ] New target
-- [ ] Feature
-- [ ] Breaking change
+[ ] Fix  
+[ ] Refactor  
+[ ] New target  
+[ ] Feature  
+[ ] Breaking change
diff --git a/.travis.yml b/.travis.yml
@@ -31,7 +31,7 @@ before_install:
   # Setup ppa to make sure arm-none-eabi-gcc is correct version
   - sudo add-apt-repository -y ppa:team-gcc-arm-embedded/ppa
   # Loop until update succeeds (timeouts can occur)
-  - while [ -n "$(sudo apt-get update 2>&1 |grep Failed)" ]; do :; done
+  - travis_retry $(! sudo apt-get update 2>&1 |grep Failed)
 
 after_success:
   - bash -c "$STATUS" success "Local $NAME testing has passed"
@@ -115,6 +115,24 @@ matrix:
         - 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
+        # Run profiling tests
+        - make -C $EVENTS/equeue prof | tee prof
+      after_success:
+        # update status if we succeeded, compare with master if possible
+        - |
+          CURR=$(grep -o '[0-9]\+ cycles' prof | awk '{sum += $1} END {print sum}')
+          PREV=$(curl https://api.github.com/repos/$TRAVIS_REPO_SLUG/status/master \
+              | jq -re "select(.sha != \"$TRAVIS_COMMIT\")
+                  | .statuses[] | select(.context == \"travis-ci/$NAME\").description
+                  | capture(\"runtime is (?<runtime>[0-9]+)\").runtime" \
+              || echo 0)
+
+          STATUSM="Passed, runtime is ${CURR} cycles"
+          if [ "$PREV" -ne 0 ]
+          then
+              STATUSM="$STATUSM ($(python -c "print '%+d' % ($CURR-$PREV)") cycles)"
+          fi
+        - bash -c "$STATUS" success "$STATUSM"
 
     - env:
         - NAME=littlefs
@@ -187,37 +205,3 @@ matrix:
               STATUSM="$STATUSM ($(python -c "print '%+.2f' % (100*($CURR-$PREV)/$PREV.0)")%)"
           fi
         - bash -c "$STATUS" success "$STATUSM"
-
-    - &mbed-2
-      env: NAME=mbed2-NXP
-      install:
-        # Install dependencies
-        - export GCC_DIR=$HOME/gcc-arm-none-eabi-6-2017-q2-update
-        - export GCC_ARCHIVE=$HOME/gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2
-        - export GCC_URL=https://developer.arm.com/-/media/Files/downloads/gnu-rm/6-2017q2/gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2?revision=2cc92fb5-3e0e-402d-9197-bdfc8224d8a5?product=GNU%20Arm%20Embedded%20Toolchain,64-bit,,Linux,6-2017-q2-update
-        - if [ ! -e $GCC_DIR/bin/arm-none-eabi-gcc ]; then wget $GCC_URL -O $GCC_ARCHIVE; tar xfj $GCC_ARCHIVE -C $HOME; fi
-        - export PATH=$PATH:$GCC_DIR/bin
-        - pip install -r requirements.txt
-        # Print versions we use
-        - arm-none-eabi-gcc --version
-        - python --version
-      before_script:
-        # Create BUILD directory for tests
-        - mkdir BUILD
-      script:
-        # Run local mbed 2 testing
-        - python -u tools/build_travis.py --vendor "${NAME#mbed2-}"
-    - <<: *mbed-2
-      env: NAME=mbed2-STM
-    - <<: *mbed-2
-      env: NAME=mbed2-NORDIC
-    - <<: *mbed-2
-      env: NAME=mbed2-SILICON_LABS
-    - <<: *mbed-2
-      env: NAME=mbed2-MAXIM
-    - <<: *mbed-2
-      env: NAME=mbed2-ATMEL
-    - <<: *mbed-2
-      env: NAME=mbed2-NUVOTON
-    - <<: *mbed-2
-      env: NAME=mbed2-RENESAS
diff --git a/TESTS/mbed_drivers/lp_timeout/main.cpp b/TESTS/mbed_drivers/lp_timeout/main.cpp
@@ -15,138 +15,79 @@
  */
 
 #if !DEVICE_LOWPOWERTIMER
-    #error [NOT_SUPPORTED] Low power timer not supported for this target
+#error [NOT_SUPPORTED] Low power timer not supported for this target
 #endif
 
+#include "mbed.h"
+#include "greentea-client/test_env.h"
 #include "utest/utest.h"
 #include "unity/unity.h"
-#include "greentea-client/test_env.h"
-
-#include "mbed.h"
+#include "../timeout/timeout_tests.h"
 
 using namespace utest::v1;
 
-volatile static bool complete;
-static LowPowerTimeout lpt;
-
-/* Timeouts are quite arbitrary due to large number of boards with varying level of accuracy */
-#define LONG_TIMEOUT (100000)
-#define SHORT_TIMEOUT (600)
-
-void cb_done() {
-    complete = true;
-}
-
-#if DEVICE_SLEEP
-void lp_timeout_1s_deepsleep(void)
+utest::v1::status_t greentea_failure_handler(const Case * const source, const failure_t reason)
 {
-    complete = false;
-    LowPowerTimer timer;
-
-    /*
-     * Since deepsleep() may shut down the UART peripheral, we wait for 10ms
-     * to allow for hardware serial buffers to completely flush.
-
-     * This should be replaced with a better function that checks if the
-     * hardware buffers are empty. However, such an API does not exist now,
-     * so we'll use the wait_ms() function for now.
-     */
-    wait_ms(10);
-
-    /*
-     * We use here the low power timer instead of microsecond timer for start and
-     * end because the microseconds timer might be disable during deepsleep.
-     */
-    timer.start();
-    lpt.attach(&cb_done, 1);
-    /* Make sure deepsleep is allowed, to go to deepsleep */
-    bool deep_sleep_allowed = sleep_manager_can_deep_sleep();
-    TEST_ASSERT_TRUE_MESSAGE(deep_sleep_allowed, "Deep sleep should be allowed");
-    sleep();
-    while (!complete);
-
-    /* It takes longer to wake up from deep sleep */
-    TEST_ASSERT_UINT32_WITHIN(LONG_TIMEOUT, 1000000, timer.read_us());
-    TEST_ASSERT_TRUE(complete);
+    greentea_case_failure_abort_handler(source, reason);
+    return STATUS_CONTINUE;
 }
 
-void lp_timeout_1s_sleep(void)
-{
-    complete = false;
-    Timer timer;
-    timer.start();
-
-    sleep_manager_lock_deep_sleep();
-    lpt.attach(&cb_done, 1);
-    bool deep_sleep_allowed = sleep_manager_can_deep_sleep();
-    TEST_ASSERT_FALSE_MESSAGE(deep_sleep_allowed, "Deep sleep should be disallowed");
-    sleep();
-    while (!complete);
-    sleep_manager_unlock_deep_sleep();
-
-    TEST_ASSERT_UINT32_WITHIN(LONG_TIMEOUT, 1000000, timer.read_us());
-    TEST_ASSERT_TRUE(complete);
-}
-#endif /* DEVICE_SLEEP */
+Case cases[] = {
+    Case("Callback called once (attach)", test_single_call<AttachTester<LowPowerTimeout> >),
+    Case("Callback called once (attach_us)", test_single_call<AttachUSTester<LowPowerTimeout> >),
 
-void lp_timeout_us(uint32_t delay_us, uint32_t tolerance)
-{
-    complete = false;
-    Timer timer;
-    timer.start();
+    Case("Callback not called when cancelled (attach)", test_cancel<AttachTester<LowPowerTimeout> >),
+    Case("Callback not called when cancelled (attach_us)", test_cancel<AttachUSTester<LowPowerTimeout> >),
 
-    lpt.attach_us(&cb_done, delay_us);
-    while (!complete);
+    Case("Callback override (attach)", test_override<AttachTester<LowPowerTimeout> >),
+    Case("Callback override (attach_us)", test_override<AttachUSTester<LowPowerTimeout> >),
 
-    /* Using RTC which is less accurate */
-    TEST_ASSERT_UINT32_WITHIN(tolerance, delay_us, timer.read_us());
-    TEST_ASSERT_TRUE(complete);
-}
+    Case("Multiple timeouts running in parallel (attach)", test_multiple<AttachTester<LowPowerTimeout> >),
+    Case("Multiple timeouts running in parallel (attach_us)", test_multiple<AttachUSTester<LowPowerTimeout> >),
 
-void lp_timeout_5s(void)
-{
-    lp_timeout_us(5000000, LONG_TIMEOUT);
-}
+    Case("Zero delay (attach)", test_no_wait<AttachTester<LowPowerTimeout> >),
+    Case("Zero delay (attach_us)", test_no_wait<AttachUSTester<LowPowerTimeout> >),
 
-void lp_timeout_1s(void)
-{
-    lp_timeout_us(1000000, LONG_TIMEOUT);
-}
+    Case("10 ms delay accuracy (attach)", test_delay_accuracy<AttachTester<LowPowerTimeout>, 10000, SHORT_DELTA_US>,
+            greentea_failure_handler),
+    Case("10 ms delay accuracy (attach_us)", test_delay_accuracy<AttachUSTester<LowPowerTimeout>, 10000, SHORT_DELTA_US>,
+            greentea_failure_handler),
 
-void lp_timeout_1ms(void)
-{
-    lp_timeout_us(1000, SHORT_TIMEOUT);
-}
+    Case("1 s delay accuracy (attach)", test_delay_accuracy<AttachTester<LowPowerTimeout>, 1000000, LONG_DELTA_US>,
+            greentea_failure_handler),
+    Case("1 s delay accuracy (attach_us)", test_delay_accuracy<AttachUSTester<LowPowerTimeout>, 1000000, LONG_DELTA_US>,
+            greentea_failure_handler),
 
-void lp_timeout_500us(void)
-{
-    lp_timeout_us(500, SHORT_TIMEOUT);
-
-}
+    Case("5 s delay accuracy (attach)", test_delay_accuracy<AttachTester<LowPowerTimeout>, 5000000, LONG_DELTA_US>,
+            greentea_failure_handler),
+    Case("5 s delay accuracy (attach_us)", test_delay_accuracy<AttachUSTester<LowPowerTimeout>, 5000000, LONG_DELTA_US>,
+            greentea_failure_handler),
 
-utest::v1::status_t greentea_failure_handler(const Case *const source, const failure_t reason) {
-    greentea_case_failure_abort_handler(source, reason);
-    return STATUS_CONTINUE;
-}
-
-Case cases[] = {
-    Case("500us LowPowerTimeout", lp_timeout_500us, greentea_failure_handler),
-    Case("1ms LowPowerTimeout", lp_timeout_1ms, greentea_failure_handler),
-    Case("1sec LowPowerTimeout", lp_timeout_1s, greentea_failure_handler),
-    Case("5sec LowPowerTimeout", lp_timeout_5s, greentea_failure_handler),
 #if DEVICE_SLEEP
-    Case("1sec LowPowerTimeout from sleep", lp_timeout_1s_sleep, greentea_failure_handler),
-    Case("1sec LowPowerTimeout from deepsleep", lp_timeout_1s_deepsleep, greentea_failure_handler),
-#endif /* DEVICE_SLEEP */
+    Case("1 s delay during sleep (attach)", test_sleep<AttachTester<LowPowerTimeout>, 1000000, LONG_DELTA_US>,
+            greentea_failure_handler),
+    Case("1 s delay during sleep (attach_us)", test_sleep<AttachUSTester<LowPowerTimeout>, 1000000, LONG_DELTA_US>,
+            greentea_failure_handler),
+
+    Case("1 s delay during deepsleep (attach)", test_deepsleep<AttachTester<LowPowerTimeout>, 1000000, LONG_DELTA_US>,
+            greentea_failure_handler),
+    Case("1 s delay during deepsleep (attach_us)", test_deepsleep<AttachUSTester<LowPowerTimeout>, 1000000, LONG_DELTA_US>,
+            greentea_failure_handler),
+#endif
+
+    Case("Timing drift (attach)", test_drift<AttachTester<LowPowerTimeout> >),
+    Case("Timing drift (attach_us)", test_drift<AttachUSTester<LowPowerTimeout> >),
 };
 
-utest::v1::status_t greentea_test_setup(const size_t number_of_cases) {
-    GREENTEA_SETUP(20, "default_auto");
+utest::v1::status_t greentea_test_setup(const size_t number_of_cases)
+{
+    GREENTEA_SETUP(240, "timing_drift_auto");
     return greentea_test_setup_handler(number_of_cases);
 }
 
 Specification specification(greentea_test_setup, cases, greentea_test_teardown_handler);
 
-int main() {
+int main()
+{
     Harness::run(specification);
 }