Merge branch 'main' into dev
diff --git a/api-tests/CMakeLists.txt b/api-tests/CMakeLists.txt
index da77ff3..f5e45c1 100644
--- a/api-tests/CMakeLists.txt
+++ b/api-tests/CMakeLists.txt
@@ -1,7 +1,7 @@
#/** @file
# * Copyright (c) 2019-2023, Arm Limited or its affiliates. All rights reserved.
-# * Copyright 2023 NXP
# * SPDX-License-Identifier : Apache-2.0
+# * Copyright 2023 NXP
# *
# * Licensed under the Apache License, Version 2.0 (the "License");
# * you may not use this file except in compliance with the License.
@@ -255,9 +255,16 @@
set(TESTSUITE_DB ${PSA_SUITE_DIR}/its_testsuite.db)
elseif((${SUITE} STREQUAL "PROTECTED_STORAGE") OR (${SUITE} STREQUAL "STORAGE"))
set(TESTSUITE_DB ${PSA_SUITE_DIR}/ps_testsuite.db)
+ elseif(${SUITE} STREQUAL "CRYPTO")
+ if(DEFINED BESPOKE_SUITE_TESTS)
+ set(TESTSUITE_DB ${PSA_ROOT_DIR}/platform/targets/${TARGET}/${BESPOKE_SUITE_TESTS})
+ else()
+ set(TESTSUITE_DB ${PSA_SUITE_DIR}/testsuite.db)
+ endif()
else()
set(TESTSUITE_DB ${PSA_SUITE_DIR}/testsuite.db)
endif()
+ message(STATUS "[PSA] : Selected test database file : ${TESTSUITE_DB}")
else()
if(${SUITE} STREQUAL "INTERNAL_TRUSTED_STORAGE")
if(${SPEC_VERSION} STREQUAL "1.0-BETA2")
diff --git a/api-tests/dev_apis/README.md b/api-tests/dev_apis/README.md
index bd4f752..9b92479 100644
--- a/api-tests/dev_apis/README.md
+++ b/api-tests/dev_apis/README.md
@@ -86,6 +86,12 @@
```
- -DTESTS_COVERAGE=<tests_coverage_value> is used to skip known failure tests by selecting value PASS. Supported values are ALL and PASS. ALL value will include all the tests and PASS value will skip the known failure tests and will include pass tests. Default is ALL.
+- -DBESPOKE_SUITE_TESTS=<testsuite_db_file> should be placed in target specific directory, if this option is enabled, the mentioned database file will be picked up for compilation. if not default location database file will be used. This option is enabled only for CRYPTO suite at the moment.
+```
+ -DBESPOKE_SUITE_TESTS='testsuite.db'
+ The build system will look for the file in the target location (target=tgt_dev_apis_tfm_an521) : api-tests/platform/targets/tgt_dev_apis_tfm_an521/testsuite.db
+```
+
To compile Crypto tests for **tgt_dev_apis_tfm_an521** platform, execute the following commands:
```
cd api-tests
@@ -133,4 +139,4 @@
--------------
-*Copyright (c) 2018-2022, Arm Limited and Contributors. All rights reserved.*
+*Copyright (c) 2018-2023, Arm Limited and Contributors. All rights reserved.*