Merge pull request #2 from ARMmbed/master

リポのアップデート

Author: onuruhuru

.github/issue_template.md

@@ -19,7 +19,7 @@
 <!--
     Required
     Add detailed description of what you are reporting.
-    Good example: https://os.mbed.com/docs/latest/reference/workflow.html
+    Good example: https://os.mbed.com/docs/mbed-os/latest/contributing/workflow.html
     Things to consider sharing:
     - What target does this relate to?
     - What toolchain (name + version) are you using?

.github/pull_request_template.md

@@ -3,7 +3,7 @@
 <!-- 
     Required
     Add here detailed changes summary, testing results, dependencies 
-    Good example: https://os.mbed.com/docs/latest/reference/workflow.html (Pull request template)
+    Good example: https://os.mbed.com/docs/mbed-os/latest/contributing/workflow.html (Pull request template)
 -->
 
 

.travis.yml

@@ -46,6 +46,8 @@ 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
   - sudo add-apt-repository -y ppa:deadsnakes/ppa
+  # workaround for https://travis-ci.community/t/then-sudo-apt-get-update-failed-public-key-is-not-available-no-pubkey-6b05f25d762e3157-in-ubuntu-xenial/1728
+  - sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 762E3157
   # Loop until update succeeds (timeouts can occur)
   - travis_retry $(! sudo apt-get update 2>&1 |grep Failed)
 
@@ -83,7 +85,6 @@ matrix:
         - doxygen doxyfile_options 2>&1
         # Once Mbed OS has been fixed, enable the full test by replacing the top line with this:
         # - ( ! doxygen doxyfile_options 2>&1 | grep . )
-
         # Assert that all binary libraries are named correctly
         # The strange command below asserts that there are exactly 0 libraries
         # that do not start with lib
@@ -104,12 +105,20 @@ matrix:
       install:
         # Install dependencies
         - sudo apt-get install gcc-arm-embedded
-        - pip install -r requirements.txt
-        - pip install pytest pylint hypothesis mock coverage coveralls
-        # Print versions we use
-
         - arm-none-eabi-gcc --version
+        # Add additional dependencies specific for testing
         - python --version
+        - |-
+          tr -d ' ' >> requirements.txt <<< "
+          mock==2.0.0
+          pytest==3.3.0
+          pylint>=1.9,<2
+          hypothesis>=3,<4
+          coverage>=4.5,<5
+          coveralls>=1.5,<2
+          "
+        # ... and install.
+        - pip install -r requirements.txt
         - pip list --verbose
       script:
         # Run local testing on tools
@@ -120,16 +129,41 @@ matrix:
       after_success:
         # Coverage for tools
         - coveralls
-        # Report success since we have overridden default behaviour
+        # Report success since we have overridden default behavior
         - bash -c "$STATUS" success "Local $NAME testing has passed"
 
-#    - <<: *tools-pytest
-#      env: NAME=tools-py3.5
-#      python: 3.5
-#
-#    - <<: *tools-pytest
-#      env: NAME=tools-py3.6
-#      python: 3.6
+    - env:
+        - NAME=doxy-spellcheck
+
+      install:
+        - sudo apt-get install aspell
+
+      script:
+        # Run local testing on header file doxy
+        - ./tools/test/travis-ci/doxy-spellchecker/spell.sh drivers
+        - ./tools/test/travis-ci/doxy-spellchecker/spell.sh platform
+        - ./tools/test/travis-ci/doxy-spellchecker/spell.sh events
+        - ./tools/test/travis-ci/doxy-spellchecker/spell.sh rtos
+        - ./tools/test/travis-ci/doxy-spellchecker/spell.sh features/netsocket
+
+      after_success:
+        # Coverage for tools
+        - coveralls
+        # Report success since we have overridden default behavior
+        - bash -c "$STATUS" success "Local $NAME testing has passed"
+
+    - <<: *tools-pytest
+      env: NAME=tools-py3.5
+      python: 3.5
+
+    - <<: *tools-pytest
+      env: NAME=tools-py3.6
+      python: 3.6
+
+    - <<: *tools-pytest
+      env: NAME=tools-py3.7
+      python: 3.7
+      dist: xenial
 
     - env:
         - NAME=astyle
@@ -142,9 +176,12 @@ matrix:
           export PATH=$PWD/bin:$PATH;
           cd -
         - astyle --version
+        # Fetch remaining information needed for branch comparison
+        - git fetch --all --unshallow --tags
+        - git fetch origin "${TRAVIS_BRANCH}"
       script:
         - >-
-          git diff --name-only --diff-filter=d HEAD..${TRAVIS_BRANCH} \
+          git diff --name-only --diff-filter=d FETCH_HEAD..HEAD \
             | ( grep '.\(c\|cpp\|h\|hpp\)$' || true ) \
             | ( fgrep -v -f .astyleignore || true ) \
             | while read file; do astyle -n --options=.astylerc "${file}"; done
@@ -270,9 +307,18 @@ matrix:
     - env:
         - NAME=licence_check
       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";
+        - >-
+          ! grep --recursive --max-count=100 --ignore-case --exclude .travis.yml \
+          "gnu general\|gnu lesser\|lesser general\|public license"
+
+    - env:
+        - NAME=include_check
+      script:
+        - echo 'Checking that there are no '#include "mbed.h"' in code where it should not be'
+        - |
+         ! git grep '^#include\s["'"']mbed.h['"'"]$' -- '*.c' '*.h' '*.cpp' '*.hpp' \
+             ':!*platform_mbed.h' ':!*TESTS/*' ':!TEST_APPS/' ':!UNITTESTS/' \
+             ':!*tests/*' ':!*targets/*' ':!*TARGET_*' ':!*unsupported/*'
 
     - env:
         - NAME=psa-autogen

CONTRIBUTING.md

@@ -2,4 +2,4 @@
 
 Mbed OS is an open-source, device software platform for the Internet of Things. Contributions are an important part of the platform, and our goal is to make it as simple as possible to become a contributor.
 
-To encourage productive collaboration, as well as robust, consistent and maintainable code, we have a set of guidelines for [contributing to Mbed OS](https://os.mbed.com/docs/latest/reference/contributing.html).
+To encourage productive collaboration, as well as robust, consistent and maintainable code, we have a set of guidelines for [contributing to Mbed OS](https://os.mbed.com/docs/mbed-os/latest/contributing/index.html).

TESTS/host_tests/crash_reporting.py

@@ -60,7 +60,7 @@ def test_steps(self):
         wait_after_reset = wait_after_reset if wait_after_reset is not None else DEFAULT_CYCLE_PERIOD
 
         #Wait 2 seconds for system to init
-        time.sleep(2.0)
+        time.sleep(7.0)
         #self.send_kv(MSG_KEY_SYNC, MSG_VALUE_DUMMY)
         self.send_kv(MSG_KEY_DEVICE_ERROR, MSG_VALUE_DUMMY)
         time.sleep(5.0)

TESTS/mbed_drivers/flashiap/main.cpp

@@ -128,6 +128,7 @@ void flashiap_cross_sector_program_test()
         agg_size += sector_size;
         address -= sector_size;
     }
+    utest_printf("ROM ends at 0x%lx, test starts at 0x%lx\n", FLASHIAP_APP_ROM_END_ADDR, address);
     TEST_SKIP_UNLESS_MESSAGE(address >= FLASHIAP_APP_ROM_END_ADDR, "Test skipped. Test region overlaps code.");
     ret = flash_device.erase(address, agg_size);
     TEST_ASSERT_EQUAL_INT32(0, ret);
@@ -184,6 +185,7 @@ void flashiap_program_error_test()
     TEST_ASSERT_TRUE(address != 0UL);
 
     // unaligned address
+    utest_printf("ROM ends at 0x%lx, test starts at 0x%lx\n", FLASHIAP_APP_ROM_END_ADDR, address);
     TEST_SKIP_UNLESS_MESSAGE(address >= FLASHIAP_APP_ROM_END_ADDR, "Test skipped. Test region overlaps code.");
     ret = flash_device.erase(address + 1, sector_size);
     TEST_ASSERT_EQUAL_INT32(-1, ret);
@@ -220,6 +222,9 @@ void flashiap_timing_test()
     utest_printf("\nFlash timing:\n");
     uint32_t sector_size = flash_device.get_sector_size(end_address - 1UL);
     uint32_t base_address = end_address - sector_size;
+    utest_printf("ROM ends at 0x%lx, test starts at 0x%lx\n", FLASHIAP_APP_ROM_END_ADDR, base_address);
+    TEST_SKIP_UNLESS_MESSAGE(base_address >= FLASHIAP_APP_ROM_END_ADDR, "Test skipped. Test region overlaps code.");
+
     timer.start();
     for (num_write_sizes = 0; num_write_sizes < max_write_sizes; num_write_sizes++) {
         if (write_size > sector_size) {

TESTS/mbed_hal/flash/functional_tests/main.cpp

@@ -175,6 +175,10 @@ void flash_erase_sector_test()
     uint32_t last_sector_size = flash_get_sector_size(&test_flash, addr_after_last - 1);
     uint32_t last_sector = addr_after_last - last_sector_size;
     TEST_ASSERT_EQUAL_INT32(0, last_sector % last_sector_size);
+
+    utest_printf("ROM ends at 0x%lx, test starts at 0x%lx\n", FLASHIAP_APP_ROM_END_ADDR, last_sector);
+    TEST_SKIP_UNLESS_MESSAGE(last_sector >= FLASHIAP_APP_ROM_END_ADDR, "Test skipped. Test region overlaps code.");
+
     ret = flash_erase_sector(&test_flash, last_sector);
     TEST_ASSERT_EQUAL_INT32(0, ret);
 
@@ -201,6 +205,9 @@ void flash_program_page_test()
 
     // sector size might not be same as page size
     uint32_t erase_sector_boundary = ALIGN_DOWN(address, flash_get_sector_size(&test_flash, address));
+    utest_printf("ROM ends at 0x%lx, test starts at 0x%lx\n", FLASHIAP_APP_ROM_END_ADDR, erase_sector_boundary);
+    TEST_SKIP_UNLESS_MESSAGE(erase_sector_boundary >= FLASHIAP_APP_ROM_END_ADDR, "Test skipped. Test region overlaps code.");
+
     ret = flash_erase_sector(&test_flash, erase_sector_boundary);
     TEST_ASSERT_EQUAL_INT32(0, ret);
 

TESTS/mbed_hal/stack_size_unification/main.cpp

@@ -0,0 +1,76 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2019-2019 ARM Limited
+ * 
+ * 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 "mbed.h"
+#include "greentea-client/test_env.h"
+#include "unity.h"
+#include "utest.h"
+
+#ifdef TARGET_RENESAS
+#error [NOT_SUPPORTED] Cortex-A target not supported for this test
+#endif
+
+using namespace utest::v1;
+
+extern osThreadAttr_t _main_thread_attr;
+extern uint32_t mbed_stack_isr_size;
+
+/* Exception for Nordic boards - BLE requires 2KB ISR stack. */
+#if defined(TARGET_NRF5x)
+#define EXPECTED_ISR_STACK_SIZE                  (2048)
+#else
+#define EXPECTED_ISR_STACK_SIZE                  (1024)
+#endif
+
+#if defined(TARGET_NUCLEO_F070RB) || defined(TARGET_NANO100) || defined(TARGET_STM32F072RB) || defined(TARGET_TMPM46B) || defined(TARGET_TMPM066)
+#define EXPECTED_MAIN_THREAD_STACK_SIZE          (3072)
+#else
+#define EXPECTED_MAIN_THREAD_STACK_SIZE          (4096)
+#endif
+
+#define EXPECTED_USER_THREAD_DEFAULT_STACK_SIZE  (4096)
+
+/* Test sizes of ISR stack, main thread stack, default user thread stack.
+ *
+ * On some platforms with lower RAM size (e.g. NUCLEO_F070RB - 16 KB RAM) it is impossible
+ * to create thread with default stack size to check its size, that is why we will
+ * check only macro which specifies default user thread stack.
+ *
+ */
+void stack_size_unification_test()
+{
+    TEST_ASSERT_EQUAL(EXPECTED_ISR_STACK_SIZE, mbed_stack_isr_size);
+    TEST_ASSERT_EQUAL(EXPECTED_MAIN_THREAD_STACK_SIZE, _main_thread_attr.stack_size);
+    TEST_ASSERT_EQUAL(EXPECTED_USER_THREAD_DEFAULT_STACK_SIZE, OS_STACK_SIZE);
+}
+
+utest::v1::status_t test_setup(const size_t number_of_cases)
+{
+    GREENTEA_SETUP(10, "default_auto");
+    return verbose_test_setup_handler(number_of_cases);
+}
+
+Case cases[] = {
+    Case("Stack size unification test", stack_size_unification_test)
+};
+
+Specification specification(test_setup, cases);
+
+int main()
+{
+    return !Harness::run(specification);
+}

TESTS/mbed_hal/stack_size_unification/stack_size_unification.h

@@ -0,0 +1,51 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2019-2019 ARM Limited
+ * 
+ * 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.
+ */
+
+/** \addtogroup hal_rtc_tests
+ *  @{
+ */
+
+#ifndef MBED_STACK_SIZE_UNIFICATION_H
+#define MBED_STACK_SIZE_UNIFICATION_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** Test sizes of ISR stack, main thread stack, default user thread stack.
+ *
+ *  Given is Mbed OS configuration.
+ *  When ISR stack, main thread stack, default user thread stack sizes are defined.
+ *  Then ISR stack size is equal to 1 KB,
+ *       main thread stack size is equal to 4 KB,
+ *       default user thread stack size is equal to 4 KB.
+ *
+ * NOTE:
+ * It is impossible to verify RTOS-less thread stack size since all tests are build with RTOS.
+ */
+void stack_size_unification_test(void);
+
+/**@}*/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+/** @}*/

TESTS/mbed_platform/crash_reporting/main.cpp

@@ -53,12 +53,17 @@ void test_crash_reporting()
 
     // Report readiness
     greentea_send_kv(MSG_KEY_DEVICE_READY, MSG_VALUE_DUMMY);
+    printf("\nMessage sent: %s\n", MSG_KEY_DEVICE_READY);
 
     static char _key[MSG_KEY_LEN + 1] = { };
     static char _value[MSG_VALUE_LEN + 1] = { };
 
+    printf("\nWaiting for crash inject error message: %s\n", MSG_KEY_DEVICE_ERROR);
     greentea_parse_kv(_key, _value, MSG_KEY_LEN, MSG_VALUE_LEN);
+    printf("\nCrash inject error message received\n");
+
     if (strcmp(_key, MSG_KEY_DEVICE_ERROR) == 0) {
+        printf("\nForcing error\n");
         MBED_ERROR1(MBED_ERROR_OUT_OF_MEMORY, "Executing crash reporting test.", 0xDEADBAD);
         TEST_ASSERT_MESSAGE(0, "crash_reporting() error call failed.");
     }
@@ -67,7 +72,7 @@ void test_crash_reporting()
 
 int main(void)
 {
-    GREENTEA_SETUP(30, "crash_reporting");
+    GREENTEA_SETUP(40, "crash_reporting");
     test_crash_reporting();
     GREENTEA_TESTSUITE_RESULT(0);
 

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

@@ -245,7 +245,10 @@ void test_handler_called_once(void)
     int32_t sem_slots = st.sem_wait(0);
     TEST_ASSERT_EQUAL_INT32(0, sem_slots);
 
-    sem_slots = st.sem_wait(osWaitForever);
+    // Wait in a busy loop to prevent entering sleep or deepsleep modes.
+    while (sem_slots != 1) {
+        sem_slots = st.sem_wait(0);
+    }
     us_timestamp_t t2 = st.get_time();
     TEST_ASSERT_EQUAL_INT32(1, sem_slots);
     TEST_ASSERT_EQUAL_UINT32(1, st.get_tick());