diff options
-rw-r--r-- | test/suites/its/CMakeLists.inc | 11 | ||||
-rw-r--r-- | test/suites/its/non_secure/psa_its_ns_interface_testsuite.c | 9 | ||||
-rw-r--r-- | test/suites/its/secure/psa_its_s_interface_testsuite.c | 9 | ||||
-rw-r--r-- | test/suites/ps/CMakeLists.inc | 11 | ||||
-rw-r--r-- | test/suites/ps/non_secure/psa_ps_ns_interface_testsuite.c | 10 | ||||
-rw-r--r-- | test/suites/ps/secure/psa_ps_s_interface_testsuite.c | 7 |
6 files changed, 3 insertions, 54 deletions
diff --git a/test/suites/its/CMakeLists.inc b/test/suites/its/CMakeLists.inc index b4e64f7680..b79140cce7 100644 --- a/test/suites/its/CMakeLists.inc +++ b/test/suites/its/CMakeLists.inc @@ -34,17 +34,6 @@ elseif (ENABLE_INTERNAL_TRUSTED_STORAGE_SERVICE_TESTS) "${ITS_TEST_DIR}/secure/psa_its_s_reliability_testsuite.c" "${ITS_TEST_DIR}/its_tests_common.c") - if (NOT ITS_RAM_FS - AND - NOT (REFERENCE_PLATFORM - OR ${TARGET_PLATFORM} STREQUAL "AN524" - OR ${TARGET_PLATFORM} STREQUAL "FVP_SSE300_MPS2")) - # Show flash warning message only when the RAM FS is not in use and the target platform contains a flash device. - # The reference platforms, AN524 and FVP_SSE300_MPS2 use RAM memory to emulate the flash. - set_property(SOURCE ${ALL_SRC_C_S} APPEND PROPERTY COMPILE_DEFINITIONS ITS_SHOW_FLASH_WARNING) - set_property(SOURCE ${ALL_SRC_C_NS} APPEND PROPERTY COMPILE_DEFINITIONS ITS_SHOW_FLASH_WARNING) - endif() - #Setting include directories embedded_include_directories(PATH ${TFM_ROOT_DIR} ABSOLUTE) embedded_include_directories(PATH ${TFM_ROOT_DIR}/interface/include ABSOLUTE) diff --git a/test/suites/its/non_secure/psa_its_ns_interface_testsuite.c b/test/suites/its/non_secure/psa_its_ns_interface_testsuite.c index 63d6ee3132..3891600c1f 100644 --- a/test/suites/its/non_secure/psa_its_ns_interface_testsuite.c +++ b/test/suites/its/non_secure/psa_its_ns_interface_testsuite.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Arm Limited. All rights reserved. + * Copyright (c) 2019-2020, Arm Limited. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause * @@ -59,11 +59,4 @@ void register_testsuite_ns_psa_its_interface(struct test_suite_t *p_test_suite) set_testsuite("PSA internal trusted storage NS interface tests " "(TFM_ITS_TEST_1XXX)", psa_its_ns_tests, list_size, p_test_suite); - -#ifdef ITS_SHOW_FLASH_WARNING - TEST_LOG("\r\n**WARNING** The ITS regression tests reduce the life of the " - "flash memory as they write/erase multiple times the memory. \r\n" - "Please, set the ITS_RAM_FS flag to use RAM instead of flash." - "\r\n\r\n"); -#endif } diff --git a/test/suites/its/secure/psa_its_s_interface_testsuite.c b/test/suites/its/secure/psa_its_s_interface_testsuite.c index cb9d4e4b61..187ee48b27 100644 --- a/test/suites/its/secure/psa_its_s_interface_testsuite.c +++ b/test/suites/its/secure/psa_its_s_interface_testsuite.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Arm Limited. All rights reserved. + * Copyright (c) 2019-2020, Arm Limited. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause * @@ -79,13 +79,6 @@ void register_testsuite_s_psa_its_interface(struct test_suite_t *p_test_suite) set_testsuite("PSA internal trusted storage S interface tests " "(TFM_ITS_TEST_2XXX)", psa_its_s_tests, list_size, p_test_suite); - -#ifdef ITS_SHOW_FLASH_WARNING - TEST_LOG("\r\n**WARNING** The ITS regression tests reduce the life of the " - "flash memory as they write/erase multiple times the memory. \r\n" - "Please, set the ITS_RAM_FS flag to use RAM instead of flash." - "\r\n\r\n"); -#endif } /** diff --git a/test/suites/ps/CMakeLists.inc b/test/suites/ps/CMakeLists.inc index 7c8b5629f3..461cd1ad6a 100644 --- a/test/suites/ps/CMakeLists.inc +++ b/test/suites/ps/CMakeLists.inc @@ -45,17 +45,6 @@ elseif (ENABLE_PROTECTED_STORAGE_SERVICE_TESTS) set_property(SOURCE ${ALL_SRC_C_NS} APPEND PROPERTY COMPILE_DEFINITIONS TFM_NS_CLIENT_IDENTIFICATION) endif() - if (NOT PS_RAM_FS - AND - NOT (REFERENCE_PLATFORM - OR ${TARGET_PLATFORM} STREQUAL "AN524" - OR ${TARGET_PLATFORM} STREQUAL "FVP_SSE300_MPS2")) - # Show flash warning message only when the RAM FS is not in use and the target platform contains a flash device. - # The reference platforms, AN524 and FVP_SSE300_MPS2 use RAM memory to emulate the flash. - set_property(SOURCE ${ALL_SRC_C_S} APPEND PROPERTY COMPILE_DEFINITIONS PS_SHOW_FLASH_WARNING) - set_property(SOURCE ${ALL_SRC_C_NS} APPEND PROPERTY COMPILE_DEFINITIONS PS_SHOW_FLASH_WARNING) - endif() - #Setting include directories embedded_include_directories(PATH ${TFM_ROOT_DIR} ABSOLUTE) embedded_include_directories(PATH ${TFM_ROOT_DIR}/test/interface/include ABSOLUTE) diff --git a/test/suites/ps/non_secure/psa_ps_ns_interface_testsuite.c b/test/suites/ps/non_secure/psa_ps_ns_interface_testsuite.c index 73b2e2a6aa..638ab8e2b4 100644 --- a/test/suites/ps/non_secure/psa_ps_ns_interface_testsuite.c +++ b/test/suites/ps/non_secure/psa_ps_ns_interface_testsuite.c @@ -137,16 +137,8 @@ void register_testsuite_ns_psa_ps_interface(struct test_suite_t *p_test_suite) list_size = (sizeof(psa_ps_ns_tests) / sizeof(psa_ps_ns_tests[0])); - set_testsuite( - "PSA protected storage NS interface tests (TFM_PS_TEST_1XXX)", + set_testsuite("PSA protected storage NS interface tests (TFM_PS_TEST_1XXX)", psa_ps_ns_tests, list_size, p_test_suite); - -#ifdef PS_SHOW_FLASH_WARNING - TEST_LOG("\r\n**WARNING** The PS regression tests reduce the life of the " - "flash memory as they write/erase multiple times the memory. \r\n" - "Please, set the PS_RAM_FS flag to use RAM instead of flash." - "\r\n\r\n"); -#endif } /** diff --git a/test/suites/ps/secure/psa_ps_s_interface_testsuite.c b/test/suites/ps/secure/psa_ps_s_interface_testsuite.c index c8d651669d..7b44d52648 100644 --- a/test/suites/ps/secure/psa_ps_s_interface_testsuite.c +++ b/test/suites/ps/secure/psa_ps_s_interface_testsuite.c @@ -126,13 +126,6 @@ void register_testsuite_s_psa_ps_interface(struct test_suite_t *p_test_suite) set_testsuite("PSA protected storage S interface tests (TFM_PS_TEST_2XXX)", psa_ps_s_tests, list_size, p_test_suite); - -#ifdef PS_SHOW_FLASH_WARNING - TEST_LOG("\r\n**WARNING** The PS regression tests reduce the life of the " - "flash memory as they write/erase multiple times the memory. \r\n" - "Please, set the PS_RAM_FS flag to use RAM instead of flash." - "\r\n\r\n"); -#endif } /** |