Merge pull request #10762 from mprse/reenable_tests

Disable only time drifting test cases and fix GREENTEA_SETUP() call in tests
pull/10807/head
Martin Kojtal 2019-06-11 07:35:41 +01:00 committed by GitHub
commit fbcae489a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 22 additions and 21 deletions

View File

@ -218,7 +218,7 @@ Case cases[] = {
utest::v1::status_t greentea_test_setup(const size_t number_of_cases) utest::v1::status_t greentea_test_setup(const size_t number_of_cases)
{ {
GREENTEA_SETUP(test_timeout, "timing_drift_auto"); GREENTEA_SETUP(test_timeout, "default_auto");
return utest::v1::greentea_test_setup_handler(number_of_cases); return utest::v1::greentea_test_setup_handler(number_of_cases);
} }

View File

@ -74,7 +74,8 @@ Case cases[] = {
Case("1 s delay during deepsleep (attach_us)", test_deepsleep<AttachUSTester<LowPowerTimeout>, 1000000, LONG_DELTA_US>, Case("1 s delay during deepsleep (attach_us)", test_deepsleep<AttachUSTester<LowPowerTimeout>, 1000000, LONG_DELTA_US>,
greentea_failure_handler), greentea_failure_handler),
#endif #endif
#if !defined(__ARM_FM) //FastModels not support time drifting test
#if !defined(SKIP_TIME_DRIFT_TESTS)
Case("Timing drift (attach)", test_drift<AttachTester<LowPowerTimeout> >), Case("Timing drift (attach)", test_drift<AttachTester<LowPowerTimeout> >),
Case("Timing drift (attach_us)", test_drift<AttachUSTester<LowPowerTimeout> >), Case("Timing drift (attach_us)", test_drift<AttachUSTester<LowPowerTimeout> >),
#endif #endif

View File

@ -329,7 +329,8 @@ Case cases[] = {
Case("Test detach", test_detach), Case("Test detach", test_detach),
Case("Test multi call and time measure", test_multi_call_time), Case("Test multi call and time measure", test_multi_call_time),
Case("Test multi ticker", test_multi_ticker), Case("Test multi ticker", test_multi_ticker),
#if !defined(__ARM_FM) //FastModels not support time drifting test
#if !defined(SKIP_TIME_DRIFT_TESTS)
Case("Test timers: 1x ticker", test_case_1x_ticker), Case("Test timers: 1x ticker", test_case_1x_ticker),
Case("Test timers: 2x ticker", test_case_2x_ticker) Case("Test timers: 2x ticker", test_case_2x_ticker)
#endif #endif

View File

@ -68,7 +68,8 @@ Case cases[] = {
Case("1 s delay during sleep (attach_us)", test_sleep<AttachUSTester<Timeout>, 1000000, LONG_DELTA_US>, Case("1 s delay during sleep (attach_us)", test_sleep<AttachUSTester<Timeout>, 1000000, LONG_DELTA_US>,
greentea_failure_handler), greentea_failure_handler),
#endif #endif
#if !defined(__ARM_FM) //FastModels not support time drifting test
#if !defined(SKIP_TIME_DRIFT_TESTS)
Case("Timing drift (attach)", test_drift<AttachTester<Timeout> >), Case("Timing drift (attach)", test_drift<AttachTester<Timeout> >),
Case("Timing drift (attach_us)", test_drift<AttachUSTester<Timeout> >), Case("Timing drift (attach_us)", test_drift<AttachUSTester<Timeout> >),
#endif #endif

View File

@ -30,12 +30,11 @@
#include "hal/lp_ticker_api.h" #include "hal/lp_ticker_api.h"
#include "hal/mbed_lp_ticker_wrapper.h" #include "hal/mbed_lp_ticker_wrapper.h"
#if !DEVICE_USTICKER #if defined(SKIP_TIME_DRIFT_TESTS)
#error [NOT_SUPPORTED] test not supported #error [NOT_SUPPORTED] test not supported
#endif #endif
//FastModels not support time drifting test #if !DEVICE_USTICKER
#if defined(__ARM_FM)
#error [NOT_SUPPORTED] test not supported #error [NOT_SUPPORTED] test not supported
#endif #endif

View File

@ -69,7 +69,7 @@ Case cases[] = {
utest::v1::status_t greentea_test_setup(const size_t number_of_cases) utest::v1::status_t greentea_test_setup(const size_t number_of_cases)
{ {
GREENTEA_SETUP(10, "timing_drift_auto"); GREENTEA_SETUP(10, "default_auto");
return utest::v1::greentea_test_setup_handler(number_of_cases); return utest::v1::greentea_test_setup_handler(number_of_cases);
} }

View File

@ -24,7 +24,7 @@
#include "hal/lp_ticker_api.h" #include "hal/lp_ticker_api.h"
//FastModels not support timing test //FastModels not support timing test
#if defined(__ARM_FM) #if defined(TARGET_ARM_FM)
#error [NOT_SUPPORTED] test not supported #error [NOT_SUPPORTED] test not supported
#endif #endif

View File

@ -19,6 +19,10 @@
#include "utest/utest.h" #include "utest/utest.h"
#include "unity/unity.h" #include "unity/unity.h"
#if defined(SKIP_TIME_DRIFT_TESTS)
#error [NOT_SUPPORTED] test not supported
#endif
#if defined(MBED_RTOS_SINGLE_THREAD) #if defined(MBED_RTOS_SINGLE_THREAD)
#error [NOT_SUPPORTED] test not supported #error [NOT_SUPPORTED] test not supported
#endif #endif
@ -27,11 +31,6 @@
#error [NOT_SUPPORTED] test not supported #error [NOT_SUPPORTED] test not supported
#endif #endif
//FastModels not support time drifting test
#if defined(__ARM_FM)
#error [NOT_SUPPORTED] test not supported
#endif
using utest::v1::Case; using utest::v1::Case;
#if defined(__CORTEX_M23) || defined(__CORTEX_M33) #if defined(__CORTEX_M23) || defined(__CORTEX_M33)

View File

@ -107,7 +107,7 @@ Case cases[] = {
utest::v1::status_t greentea_test_setup(const size_t number_of_cases) utest::v1::status_t greentea_test_setup(const size_t number_of_cases)
{ {
GREENTEA_SETUP(10, "timing_drift_auto"); GREENTEA_SETUP(10, "default_auto");
return utest::v1::greentea_test_setup_handler(number_of_cases); return utest::v1::greentea_test_setup_handler(number_of_cases);
} }

View File

@ -31,7 +31,7 @@ using namespace utest::v1;
#if defined(__CORTEX_M23) || defined(__CORTEX_M33) #if defined(__CORTEX_M23) || defined(__CORTEX_M33)
#define THREAD_STACK_SIZE 512 #define THREAD_STACK_SIZE 512
#elif defined(__ARM_FM) #elif defined(TARGET_ARM_FM)
#define THREAD_STACK_SIZE 512 #define THREAD_STACK_SIZE 512
#elif defined(TARGET_CY8CKIT_062_WIFI_BT_PSA) #elif defined(TARGET_CY8CKIT_062_WIFI_BT_PSA)
#define THREAD_STACK_SIZE 512 #define THREAD_STACK_SIZE 512

View File

@ -39,7 +39,7 @@ volatile bool thread_should_continue = true;
#define THREAD_STACK_SIZE 512 #define THREAD_STACK_SIZE 512
#elif defined(__CORTEX_M23) || defined(__CORTEX_M33) #elif defined(__CORTEX_M23) || defined(__CORTEX_M33)
#define THREAD_STACK_SIZE 512 #define THREAD_STACK_SIZE 512
#elif defined(__ARM_FM) #elif defined(TARGET_ARM_FM)
#define THREAD_STACK_SIZE 512 #define THREAD_STACK_SIZE 512
#elif defined(TARGET_CY8CKIT_062_WIFI_BT_PSA) #elif defined(TARGET_CY8CKIT_062_WIFI_BT_PSA)
#define THREAD_STACK_SIZE 512 #define THREAD_STACK_SIZE 512
@ -211,7 +211,7 @@ Case cases[] = {
utest::v1::status_t greentea_test_setup(const size_t number_of_cases) utest::v1::status_t greentea_test_setup(const size_t number_of_cases)
{ {
GREENTEA_SETUP(test_timeout, "timing_drift_auto"); GREENTEA_SETUP(test_timeout, "default_auto");
return utest::v1::greentea_test_setup_handler(number_of_cases); return utest::v1::greentea_test_setup_handler(number_of_cases);
} }

View File

@ -34,7 +34,7 @@
#define PARALLEL_THREAD_STACK_SIZE 512 #define PARALLEL_THREAD_STACK_SIZE 512
#elif defined(__CORTEX_M23) || defined(__CORTEX_M33) #elif defined(__CORTEX_M23) || defined(__CORTEX_M33)
#define PARALLEL_THREAD_STACK_SIZE 512 #define PARALLEL_THREAD_STACK_SIZE 512
#elif defined(__ARM_FM) #elif defined(TARGET_ARM_FM)
#define PARALLEL_THREAD_STACK_SIZE 512 #define PARALLEL_THREAD_STACK_SIZE 512
#elif defined(TARGET_CY8CKIT_062_WIFI_BT_PSA) #elif defined(TARGET_CY8CKIT_062_WIFI_BT_PSA)
#define PARALLEL_THREAD_STACK_SIZE 512 #define PARALLEL_THREAD_STACK_SIZE 512

View File

@ -4268,7 +4268,7 @@
"SERIAL_FC", "SERIAL_FC",
"TRNG", "TRNG",
"FLASH", "FLASH",
"QSPI", "QSPI",
"MPU" "MPU"
], ],
"release_versions": ["2", "5"], "release_versions": ["2", "5"],
@ -8032,7 +8032,7 @@
"ARM_FM": { "ARM_FM": {
"inherits": ["Target"], "inherits": ["Target"],
"public": false, "public": false,
"macros": ["__ARM_FM"], "macros": ["SKIP_TIME_DRIFT_TESTS"],
"extra_labels": ["ARM_FM"] "extra_labels": ["ARM_FM"]
}, },
"FVP_MPS2": { "FVP_MPS2": {