Merge remote-tracking branch 'upstream/master' into offir-mbed-qspif

Author: Offir Kochalsky

.gitignore

@@ -88,3 +88,9 @@ tags
 .vscode/
 
 features/FEATURE_BLE/targets/TARGET_CORDIO/stack_backup/
+
+.pytest_cache
+log
+
+# Icetea related file
+test_suite.json

.travis.yml

@@ -162,7 +162,7 @@ matrix:
         - 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/cellular features/netsocket features/nanostack features/lwipstack features/frameworks/greentea-client features/frameworks/utest features/frameworks/unity BUILD
+        - rm -r rtos features/cellular features/netsocket features/nanostack features/lwipstack features/frameworks/greentea-client features/frameworks/utest features/frameworks/unity components 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
@@ -187,12 +187,11 @@ matrix:
 
     - env:
         - NAME=littlefs
-        - LITTLEFS=features/filesystem/littlefs
+        - LITTLEFS=features/storage/filesystem/littlefs
       install:
         # Install dependencies
         - sudo apt-get install gcc-arm-embedded fuse libfuse-dev
         - pip install -r requirements.txt
-        - git clone https://github.com/armmbed/spiflash-driver.git
         # Print versions
         - arm-none-eabi-gcc --version
         - gcc --version
@@ -268,3 +267,4 @@ matrix:
       script:
         - echo 'Checking that there is no GPL licence text in code'
         - ! git grep -q --ignore-case "gnu general public";
+        - ! git grep -q --ignore-case "gnu library general public";

README.md

@@ -33,3 +33,9 @@ We have a [developer website](https://os.mbed.com) for asking questions, engagin
 ## Getting started for contributors
 
 We also have a [contributing and publishing guide](https://os.mbed.com/contributing/) that covers licensing, contributor agreements and style guidelines.
+
+## Documentation
+
+For more information about Mbed OS, please see [our published documentation](https://os.mbed.com/docs/latest). It includes published Doxygen for our APIs, step-by-step tutorials, porting information and background reference materials about our architecture and tools.
+
+To contribute to this documentation, please see the [mbed-os-5-docs repo](https://github.com/ARMmbed/mbed-os-5-docs).

TESTS/host_tests/system_reset.py

@@ -36,9 +36,6 @@ class SystemResetTest(BaseHostTest):
     def __init__(self):
         super(SystemResetTest, self).__init__()
         self.reset = False
-        cycle_s = self.get_config_item('program_cycle_s')
-        self.program_cycle_s = cycle_s if cycle_s is not None else DEFAULT_CYCLE_PERIOD
-
         self.test_steps_sequence = self.test_steps()
         # Advance the coroutine to it's first yield statement.
         self.test_steps_sequence.send(None)
@@ -61,16 +58,18 @@ def test_steps(self):
         """Reset the device and check the status
         """
         system_reset = yield
-
         self.reset = False
+
+        wait_after_reset = self.get_config_item('forced_reset_timeout')
+        wait_after_reset = wait_after_reset if wait_after_reset is not None else DEFAULT_CYCLE_PERIOD
+
         self.send_kv(MSG_KEY_DEVICE_RESET, MSG_VALUE_DUMMY)
-        time.sleep(self.program_cycle_s)
+        time.sleep(wait_after_reset)
         self.send_kv(MSG_KEY_SYNC, MSG_VALUE_DUMMY)
 
         system_reset = yield
-
         if self.reset == False:
             raise RuntimeError('Platform did not reset as expected.')
 
         # The sequence is correct -- test passed.
-        yield True
+        yield True

TESTS/host_tests/trng_reset.py

@@ -0,0 +1,145 @@
+"""
+Copyright (c) 2018 ARM Limited
+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.
+"""
+
+"""
+This script is the host script for trng test sequence, it send the 
+step signaling sequence and receive and transmit data to the device after 
+reset if necesarry (default loading and storing mechanism while reseting the device
+is NVstore, in case NVstore isn't enabled we'll use current infrastructure,
+for more details see main.cpp file)
+"""
+
+import time
+from mbed_host_tests import BaseHostTest
+from mbed_host_tests.host_tests_runner.host_test_default import DefaultTestSelector
+from time import sleep
+
+DEFAULT_CYCLE_PERIOD      = 1.0
+MSG_VALUE_DUMMY           = '0'
+MSG_TRNG_READY            = 'ready'
+MSG_TRNG_BUFFER           = 'buffer'
+MSG_TRNG_TEST_STEP1       = 'check_step1'
+MSG_TRNG_TEST_STEP2       = 'check_step2'
+MSG_KEY_SYNC              = '__sync'
+MSG_KEY_RESET_COMPLETE    = 'reset_complete'
+MSG_KEY_TEST_SUITE_ENDED  = 'Test_suite_ended'
+MSG_KEY_EXIT              = 'exit'
+
+class TRNGResetTest(BaseHostTest):
+    """Test for the TRNG API.
+    """
+
+    def __init__(self):
+        super(TRNGResetTest, self).__init__()
+        self.did_reset = False
+        self.ready = False
+        self.suite_ended = False
+        self.buffer = 0
+        self.test_steps_sequence = self.test_steps()
+        # Advance the coroutine to it's first yield statement.
+        self.test_steps_sequence.send(None)
+
+    #define callback functions for msg handling
+    def setup(self):
+        self.register_callback(MSG_TRNG_READY, self.cb_device_ready)
+        self.register_callback(MSG_TRNG_BUFFER, self.cb_trng_buffer)
+        self.register_callback(MSG_KEY_TEST_SUITE_ENDED, self.cb_device_test_suit_ended)
+        self.register_callback(MSG_KEY_RESET_COMPLETE, self.cb_reset_complete)
+
+    #receive sent data from device before reset
+    def cb_trng_buffer(self, key, value, timestamp):
+        """Acknowledge device rebooted correctly and feed the test execution
+        """
+        self.buffer = value
+
+        try:
+            if self.test_steps_sequence.send(value):
+                self.notify_complete(True)
+        except (StopIteration, RuntimeError) as exc:
+            self.notify_complete(False)
+
+    def cb_device_ready(self, key, value, timestamp):
+        """Acknowledge device rebooted correctly and feed the test execution
+        """
+        self.ready = True
+
+        try:
+            if self.test_steps_sequence.send(value):
+                self.notify_complete(True)
+        except (StopIteration, RuntimeError) as exc:
+            self.notify_complete(False)
+
+    def cb_reset_complete(self, key, value, timestamp):
+        """Acknowledge reset complete
+        """
+        self.did_reset = True
+
+        try:
+            if self.test_steps_sequence.send(value):
+                self.notify_complete(True)
+        except (StopIteration, RuntimeError) as exc:
+            self.notify_complete(False)
+
+    def cb_device_test_suit_ended(self, key, value, timestamp):
+        """Acknowledge device finished a test step correctly and feed the test execution
+        """
+        self.suite_ended = True
+
+        try:
+            if self.test_steps_sequence.send(value):
+                self.notify_complete(True)
+        except (StopIteration, RuntimeError) as exc:
+            self.notify_complete(False)
+
+    #define test steps and actions
+    def test_steps(self):
+        """Test step 1
+        """
+        wait_for_communication = yield
+
+        self.ready = False
+        self.did_reset = False
+        self.suite_ended = False
+        self.send_kv(MSG_TRNG_TEST_STEP1, MSG_VALUE_DUMMY)
+        wait_for_communication = yield
+        if self.buffer == 0:
+            raise RuntimeError('Phase 1: No buffer received.')
+
+        self.reset()
+
+        """Test step 2 (After reset)
+        """
+        wait_for_communication = yield
+        if self.did_reset == False:
+            raise RuntimeError('Phase 1: Platform did not reset as expected.')
+
+        self.send_kv(MSG_KEY_SYNC, MSG_VALUE_DUMMY)
+
+        wait_for_communication = yield
+
+        if self.ready == False:
+            raise RuntimeError('Phase 1: Platform not ready as expected.')
+
+        self.send_kv(MSG_TRNG_TEST_STEP2, self.buffer)
+
+        wait_for_communication = yield
+
+        if self.suite_ended == False:
+            raise RuntimeError('Test failed.')
+
+        self.send_kv(MSG_KEY_EXIT, MSG_VALUE_DUMMY)
+
+        # The sequence is correct -- test passed.
+        yield

TESTS/mbed_drivers/crc/main.cpp

@@ -125,11 +125,41 @@ void test_any_polynomial()
     }
 }
 
+void test_thread(void)
+{
+    char  test[] = "123456789";
+    uint32_t crc;
+    MbedCRC<POLY_32BIT_ANSI, 32> ct;
+    TEST_ASSERT_EQUAL(0, ct.compute((void *)test, strlen((const char*)test), &crc));
+    TEST_ASSERT_EQUAL(0xCBF43926, crc);
+}
+
+void test_thread_safety()
+{
+    char  test[] = "123456789";
+    uint32_t crc;
+
+    MbedCRC<POLY_16BIT_IBM, 16> ct;
+
+    TEST_ASSERT_EQUAL(0, ct.compute_partial_start(&crc));
+    TEST_ASSERT_EQUAL(0, ct.compute_partial((void *)&test, 4, &crc));
+
+    Thread t1(osPriorityNormal1, 320);
+    t1.start(callback(test_thread));
+    TEST_ASSERT_EQUAL(0, ct.compute_partial((void *)&test[4], 5, &crc));
+    TEST_ASSERT_EQUAL(0, ct.compute_partial_stop(&crc));
+    TEST_ASSERT_EQUAL(0xBB3D, crc);
+
+    // Wait for the thread to finish
+    t1.join();
+}
+
 Case cases[] = {
     Case("Test supported polynomials", test_supported_polynomials),
     Case("Test partial CRC", test_partial_crc),
     Case("Test SD CRC polynomials", test_sd_crc),
-    Case("Test not supported polynomials", test_any_polynomial)
+    Case("Test not supported polynomials", test_any_polynomial),
+    Case("Test thread safety", test_thread_safety)
 };
 
 utest::v1::status_t greentea_test_setup(const size_t number_of_cases)

TESTS/mbed_drivers/mem_trace/main.cpp

@@ -24,8 +24,8 @@
 #include <stdio.h>
 #include <stdarg.h>
 
-#ifndef MBED_MEM_TRACING_ENABLED
-#error [NOT_SUPPORTED] test not supported
+#if !MBED_MEM_TRACING_ENABLED
+  #error [NOT_SUPPORTED] test not supported
 #endif
 
 using utest::v1::Case;

TESTS/mbed_hal/common_tickers/main.cpp

@@ -473,11 +473,14 @@ void ticker_speed_test(void)
 
     /* ---- Test fire_interrupt function. ---- */
     counter = NUM_OF_CALLS;
+    /* Disable ticker interrupt which would interfere with speed test */
+    core_util_critical_section_enter();
     start = us_ticker_read();
     while (counter--) {
         intf->fire_interrupt();
     }
     stop = us_ticker_read();
+    core_util_critical_section_exit();
 
     TEST_ASSERT(diff_us(start, stop, us_ticker_info) < (NUM_OF_CALLS * (MAX_FUNC_EXEC_TIME_US + DELTA_FUNC_EXEC_TIME_US)));
 
@@ -569,7 +572,7 @@ utest::v1::status_t lp_ticker_teardown(const Case *const source, const size_t pa
 
 utest::v1::status_t test_setup(const size_t number_of_cases)
 {
-    GREENTEA_SETUP(30, "default_auto");
+    GREENTEA_SETUP(80, "default_auto");
     return verbose_test_setup_handler(number_of_cases);
 }