Remove #ifndef NO_GREENTEA from tests

Oren Cohen · Oren Cohen · commit fc97a75632ab · 2019-03-14T11:16:44.000+02:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -438,9 +438,7 @@ utest::v1::status_t case_teardown_handler(const Case *const source, const size_t`
`438`	`438`
`439`	`439`	`utest::v1::status_t test_setup(const size_t number_of_cases)`
`440`	`440`	`{`
`441`		`-#ifndef NO_GREENTEA`
`442`	`441`	`GREENTEA_SETUP(120, "default_auto");`
`443`		`-#endif`
`444`	`442`	`return verbose_test_setup_handler(number_of_cases);`
`445`	`443`	`}`
`446`	`444`
Original file line number	Diff line number	Diff line change
`@@ -150,9 +150,7 @@ Case cases[] = {`
`150`	`150`
`151`	`151`	`utest::v1::status_t greentea_test_setup(const size_t number_of_cases)`
`152`	`152`	`{`
`153`		`-#ifndef NO_GREENTEA`
`154`	`153`	`GREENTEA_SETUP(20, "default_auto");`
`155`		`-#endif`
`156`	`154`	`return greentea_test_setup_handler(number_of_cases);`
`157`	`155`	`}`
`158`	`156`
Original file line number	Diff line number	Diff line change
`@@ -44,9 +44,7 @@ using namespace utest::v1;`
`44`	`44`
`45`	`45`	`utest::v1::status_t greentea_test_setup(const size_t number_of_cases)`
`46`	`46`	`{`
`47`		`-#ifndef NO_GREENTEA`
`48`	`47`	`GREENTEA_SETUP(60, "default_auto");`
`49`		`-#endif`
`50`	`48`	`return greentea_test_setup_handler(number_of_cases);`
`51`	`49`	`}`
`52`	`50`
Original file line number	Diff line number	Diff line change
`@@ -468,9 +468,7 @@ utest::v1::status_t case_teardown_handler(const Case *const source, const size_t`
`468`	`468`
`469`	`469`	`utest::v1::status_t test_setup(const size_t number_of_cases)`
`470`	`470`	`{`
`471`		`-#ifndef NO_GREENTEA`
`472`	`471`	`GREENTEA_SETUP(120, "default_auto");`
`473`		`-#endif`
`474`	`472`	`return verbose_test_setup_handler(number_of_cases);`
`475`	`473`	`}`
`476`	`474`
Original file line number	Diff line number	Diff line change
`@@ -41,9 +41,7 @@ using namespace utest::v1;`
`41`	`41`
`42`	`42`	`utest::v1::status_t greentea_test_setup(const size_t number_of_cases)`
`43`	`43`	`{`
`44`		`-#ifndef NO_GREENTEA`
`45`	`44`	`GREENTEA_SETUP(60, "default_auto");`
`46`		`-#endif`
`47`	`45`	`return greentea_test_setup_handler(number_of_cases);`
`48`	`46`	`}`
`49`	`47`
Original file line number	Diff line number	Diff line change
`@@ -92,9 +92,7 @@ void run_entropy_inject_with_crypto_init()`
`92`	`92`
`93`	`93`	`utest::v1::status_t greentea_test_setup(const size_t number_of_cases)`
`94`	`94`	`{`
`95`		`-#ifndef NO_GREENTEA`
`96`	`95`	`GREENTEA_SETUP(60, "default_auto");`
`97`		`-#endif`
`98`	`96`
`99`	`97`	`/* fill seed in some data */`
`100`	`98`	`for (size_t i = 0; i < sizeof(seed); ++i) {`
Original file line number	Diff line number	Diff line change
`@@ -184,9 +184,7 @@ Case cases[] = {`
`184`	`184`
`185`	`185`	`utest::v1::status_t greentea_test_setup(const size_t number_of_cases)`
`186`	`186`	`{`
`187`		`-#ifndef NO_GREENTEA`
`188`	`187`	`GREENTEA_SETUP(60, "default_auto");`
`189`		`-#endif`
`190`	`188`	`return greentea_test_setup_handler(number_of_cases);`
`191`	`189`	`}`
`192`	`190`
Original file line number	Diff line number	Diff line change
`@@ -475,9 +475,7 @@ Case cases[] = {`
`475`	`475`	`utest::v1::status_t test_setup(const size_t number_of_cases)`
`476`	`476`	`{`
`477`	`477`	`// Setup Greentea using a reasonable timeout in seconds`
`478`		`-#ifndef NO_GREENTEA`
`479`	`478`	`GREENTEA_SETUP(60, "default_auto");`
`480`		`-#endif`
`481`	`479`	`return verbose_test_setup_handler(number_of_cases);`
`482`	`480`	`}`
`483`	`481`
Original file line number	Diff line number	Diff line change
`@@ -213,9 +213,7 @@ utest::v1::status_t spm_setup(const size_t number_of_cases)`
`213`	`213`	`error("Could not open a connection with SERVER_TESTS_PART1_CONTROL ROT_SRV");`
`214`	`214`	`}`
`215`	`215`
`216`		`-#ifndef NO_GREENTEA`
`217`	`216`	`GREENTEA_SETUP(60, "default_auto");`
`218`		`-#endif`
`219`	`217`	`return greentea_test_setup_handler(number_of_cases);`
`220`	`218`	`}`
`221`	`219`
Original file line number	Diff line number	Diff line change
`@@ -74,10 +74,7 @@ void example_main(void)`
`74`	`74`
`75`	`75`	`utest::v1::status_t greentea_setup(const size_t number_of_cases)`
`76`	`76`	`{`
`77`		`-#ifndef NO_GREENTEA`
`78`	`77`	`GREENTEA_SETUP(20, "default_auto");`
`79`		`-#endif`
`80`		`- // Call the default reporting function`
`81`	`78`	`return greentea_test_setup_handler(number_of_cases);`
`82`	`79`	`}`
`83`	`80`