From fc97a75632aba416a22040cee3e61f236bc3c8b6 Mon Sep 17 00:00:00 2001 From: Oren Cohen Date: Sun, 3 Mar 2019 14:53:25 +0200 Subject: [PATCH] Remove #ifndef NO_GREENTEA from tests --- TESTS/mbed-crypto/sanity/main.cpp | 2 -- TESTS/mbed_hal/spm/main.cpp | 2 -- TESTS/psa/attestation/main.cpp | 2 -- TESTS/psa/crypto_access_control/COMPONENT_NSPE/main.cpp | 2 -- TESTS/psa/crypto_init/main.cpp | 2 -- TESTS/psa/entropy_inject/main.cpp | 2 -- TESTS/psa/its_ps/main.cpp | 2 -- TESTS/psa/spm_client/COMPONENT_NSPE/main.cpp | 2 -- TESTS/psa/spm_server/COMPONENT_NSPE/main.cpp | 2 -- TESTS/psa/spm_smoke/COMPONENT_NSPE/main.cpp | 3 --- features/frameworks/TARGET_PSA/val_greentea.cpp | 2 -- 11 files changed, 23 deletions(-) diff --git a/TESTS/mbed-crypto/sanity/main.cpp b/TESTS/mbed-crypto/sanity/main.cpp index 051d88b2e3..d71563dbcb 100644 --- a/TESTS/mbed-crypto/sanity/main.cpp +++ b/TESTS/mbed-crypto/sanity/main.cpp @@ -438,9 +438,7 @@ utest::v1::status_t case_teardown_handler(const Case *const source, const size_t utest::v1::status_t test_setup(const size_t number_of_cases) { -#ifndef NO_GREENTEA GREENTEA_SETUP(120, "default_auto"); -#endif return verbose_test_setup_handler(number_of_cases); } diff --git a/TESTS/mbed_hal/spm/main.cpp b/TESTS/mbed_hal/spm/main.cpp index 8d654fb599..ba73753cb8 100644 --- a/TESTS/mbed_hal/spm/main.cpp +++ b/TESTS/mbed_hal/spm/main.cpp @@ -150,9 +150,7 @@ Case cases[] = { utest::v1::status_t greentea_test_setup(const size_t number_of_cases) { -#ifndef NO_GREENTEA GREENTEA_SETUP(20, "default_auto"); -#endif return greentea_test_setup_handler(number_of_cases); } diff --git a/TESTS/psa/attestation/main.cpp b/TESTS/psa/attestation/main.cpp index 72a5a29019..391c0a289f 100755 --- a/TESTS/psa/attestation/main.cpp +++ b/TESTS/psa/attestation/main.cpp @@ -44,9 +44,7 @@ using namespace utest::v1; utest::v1::status_t greentea_test_setup(const size_t number_of_cases) { -#ifndef NO_GREENTEA GREENTEA_SETUP(60, "default_auto"); -#endif return greentea_test_setup_handler(number_of_cases); } diff --git a/TESTS/psa/crypto_access_control/COMPONENT_NSPE/main.cpp b/TESTS/psa/crypto_access_control/COMPONENT_NSPE/main.cpp index 01ecfea677..c6311a8dc3 100644 --- a/TESTS/psa/crypto_access_control/COMPONENT_NSPE/main.cpp +++ b/TESTS/psa/crypto_access_control/COMPONENT_NSPE/main.cpp @@ -468,9 +468,7 @@ utest::v1::status_t case_teardown_handler(const Case *const source, const size_t utest::v1::status_t test_setup(const size_t number_of_cases) { -#ifndef NO_GREENTEA GREENTEA_SETUP(120, "default_auto"); -#endif return verbose_test_setup_handler(number_of_cases); } diff --git a/TESTS/psa/crypto_init/main.cpp b/TESTS/psa/crypto_init/main.cpp index b7fa4824e2..cad0258d2a 100644 --- a/TESTS/psa/crypto_init/main.cpp +++ b/TESTS/psa/crypto_init/main.cpp @@ -41,9 +41,7 @@ using namespace utest::v1; utest::v1::status_t greentea_test_setup(const size_t number_of_cases) { -#ifndef NO_GREENTEA GREENTEA_SETUP(60, "default_auto"); -#endif return greentea_test_setup_handler(number_of_cases); } diff --git a/TESTS/psa/entropy_inject/main.cpp b/TESTS/psa/entropy_inject/main.cpp index 355312f0fc..da3898c7d9 100644 --- a/TESTS/psa/entropy_inject/main.cpp +++ b/TESTS/psa/entropy_inject/main.cpp @@ -92,9 +92,7 @@ void run_entropy_inject_with_crypto_init() utest::v1::status_t greentea_test_setup(const size_t number_of_cases) { -#ifndef NO_GREENTEA GREENTEA_SETUP(60, "default_auto"); -#endif /* fill seed in some data */ for (size_t i = 0; i < sizeof(seed); ++i) { diff --git a/TESTS/psa/its_ps/main.cpp b/TESTS/psa/its_ps/main.cpp index b78507487e..38ab54fddb 100644 --- a/TESTS/psa/its_ps/main.cpp +++ b/TESTS/psa/its_ps/main.cpp @@ -184,9 +184,7 @@ Case cases[] = { utest::v1::status_t greentea_test_setup(const size_t number_of_cases) { -#ifndef NO_GREENTEA GREENTEA_SETUP(60, "default_auto"); -#endif return greentea_test_setup_handler(number_of_cases); } diff --git a/TESTS/psa/spm_client/COMPONENT_NSPE/main.cpp b/TESTS/psa/spm_client/COMPONENT_NSPE/main.cpp index f5e62328f4..aad62cbd1c 100644 --- a/TESTS/psa/spm_client/COMPONENT_NSPE/main.cpp +++ b/TESTS/psa/spm_client/COMPONENT_NSPE/main.cpp @@ -475,9 +475,7 @@ Case cases[] = { utest::v1::status_t test_setup(const size_t number_of_cases) { // Setup Greentea using a reasonable timeout in seconds -#ifndef NO_GREENTEA GREENTEA_SETUP(60, "default_auto"); -#endif return verbose_test_setup_handler(number_of_cases); } diff --git a/TESTS/psa/spm_server/COMPONENT_NSPE/main.cpp b/TESTS/psa/spm_server/COMPONENT_NSPE/main.cpp index e225e6fd10..1877e1059e 100644 --- a/TESTS/psa/spm_server/COMPONENT_NSPE/main.cpp +++ b/TESTS/psa/spm_server/COMPONENT_NSPE/main.cpp @@ -213,9 +213,7 @@ utest::v1::status_t spm_setup(const size_t number_of_cases) error("Could not open a connection with SERVER_TESTS_PART1_CONTROL ROT_SRV"); } -#ifndef NO_GREENTEA GREENTEA_SETUP(60, "default_auto"); -#endif return greentea_test_setup_handler(number_of_cases); } diff --git a/TESTS/psa/spm_smoke/COMPONENT_NSPE/main.cpp b/TESTS/psa/spm_smoke/COMPONENT_NSPE/main.cpp index 2ab94f32ac..49dac6e3c2 100644 --- a/TESTS/psa/spm_smoke/COMPONENT_NSPE/main.cpp +++ b/TESTS/psa/spm_smoke/COMPONENT_NSPE/main.cpp @@ -74,10 +74,7 @@ void example_main(void) utest::v1::status_t greentea_setup(const size_t number_of_cases) { -#ifndef NO_GREENTEA GREENTEA_SETUP(20, "default_auto"); -#endif - // Call the default reporting function return greentea_test_setup_handler(number_of_cases); } diff --git a/features/frameworks/TARGET_PSA/val_greentea.cpp b/features/frameworks/TARGET_PSA/val_greentea.cpp index 3ff074c2b6..6498c9b6ee 100644 --- a/features/frameworks/TARGET_PSA/val_greentea.cpp +++ b/features/frameworks/TARGET_PSA/val_greentea.cpp @@ -20,9 +20,7 @@ void mbed_val_test_init(uint32_t test_num, char8_t *desc, uint32_t test_bitfield mbed_val_print(PRINT_ALWAYS, "\nTEST: %d | DESCRIPTION: ", test_num); mbed_val_print(PRINT_ALWAYS, desc, 0); -#ifndef NO_GREENTEA GREENTEA_SETUP(100, "default_auto"); -#endif mbed_val_set_status(RESULT_START(VAL_STATUS_SUCCESS)); pal_mbed_os_compliance_test_initialize(); return;