commit 7564106bc7735fbdcc98a3c41715e3535eff9a1c
author Vinay Kumar Kotegowder <vinaykumar.kotegowder@arm.com> Fri Apr 24 16:44:12 2020 +0530
committer Jamie Fox <jamie.fox@arm.com> Thu May 14 10:25:04 2020 +0000
tree ce51c754a2f00a2faadd0a67d0d12641a4dba94f
parent dc5b7f2d0bbc6d093c12e1e4c9a18967409f5c09

Build: New build option to enable combined build for ITS and PS Arch tests.

New option   : -DPSA_API_TEST_STORAGE=ON

Example usage: -DPSA_API_TEST_INTERNAL_TRUSTED_STORAGE=ON
               -DPSA_API_TEST_PROTECTED_STORAGE=ON
               -DPSA_API_TEST_STORAGE=ON

Change-Id: Ib3dbe7d5e7e8281855b7b7c6021820ef2dedfa4b
Signed-off-by: Vinay Kumar Kotegowder <vinaykumar.kotegowder@arm.com>

CommonConfig.cmake

diff --git a/CommonConfig.cmake b/CommonConfig.cmake
index 045cb1f..e98ac3a 100644
--- a/CommonConfig.cmake
+++ b/CommonConfig.cmake
@@ -347,6 +347,9 @@
 	if (NOT DEFINED PSA_API_TEST_CRYPTO)
 		set(PSA_API_TEST_CRYPTO OFF)
 	endif()
+	if (NOT DEFINED PSA_API_TEST_STORAGE)
+		set(PSA_API_TEST_STORAGE OFF)
+	endif()
 	if (NOT DEFINED PSA_API_TEST_INTERNAL_TRUSTED_STORAGE)
 		set(PSA_API_TEST_INTERNAL_TRUSTED_STORAGE OFF)
 	endif()

app/CMakeLists.txt

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index bad2bc9..d8fe183 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -279,11 +279,8 @@
 		target_link_libraries(${EXE_NAME} "${PSA_API_TEST_BUILD_PATH}/val/val_nspe.a")
 		target_link_libraries(${EXE_NAME} "${PSA_API_TEST_BUILD_PATH}/platform/pal_nspe.a")
 	endif()
-	if(PSA_API_TEST_NS AND PSA_API_TEST_INTERNAL_TRUSTED_STORAGE)
-		target_link_libraries(${EXE_NAME} "${PSA_API_TEST_BUILD_PATH}/dev_apis/internal_trusted_storage/test_combine.a")
-	endif()
-	if(PSA_API_TEST_NS AND PSA_API_TEST_PROTECTED_STORAGE)
-		target_link_libraries(${EXE_NAME} "${PSA_API_TEST_BUILD_PATH}/dev_apis/protected_storage/test_combine.a")
+	if(PSA_API_TEST_NS AND (PSA_API_TEST_INTERNAL_TRUSTED_STORAGE OR PSA_API_TEST_PROTECTED_STORAGE OR PSA_API_TEST_STORAGE))
+		target_link_libraries(${EXE_NAME} "${PSA_API_TEST_BUILD_PATH}/dev_apis/storage/test_combine.a")
 	endif()
 	if(PSA_API_TEST_NS AND PSA_API_TEST_CRYPTO)
 		target_link_libraries(${EXE_NAME} "${PSA_API_TEST_BUILD_PATH}/dev_apis/crypto/test_combine.a")

docs/user_guides/tfm_build_instruction.rst

diff --git a/docs/user_guides/tfm_build_instruction.rst b/docs/user_guides/tfm_build_instruction.rst
index 44f0b0a..77666c9 100644
--- a/docs/user_guides/tfm_build_instruction.rst
+++ b/docs/user_guides/tfm_build_instruction.rst
@@ -96,6 +96,7 @@
 
     -DPSA_API_TEST_INTERNAL_TRUSTED_STORAGE=ON
     -DPSA_API_TEST_PROTECTED_STORAGE=ON
+    -DPSA_API_TEST_STORAGE=ON
     -DPSA_API_TEST_CRYPTO=ON
     -DPSA_API_TEST_INITIAL_ATTESTATION=ON
 

platform/ext/target/cypress/psoc64/cypress_psoc64_spec.rst

diff --git a/platform/ext/target/cypress/psoc64/cypress_psoc64_spec.rst b/platform/ext/target/cypress/psoc64/cypress_psoc64_spec.rst
index e0810a5..038d15e 100644
--- a/platform/ext/target/cypress/psoc64/cypress_psoc64_spec.rst
+++ b/platform/ext/target/cypress/psoc64/cypress_psoc64_spec.rst
@@ -158,6 +158,7 @@
          - ``PSA_API_TEST_CRYPTO``
          - ``PSA_API_TEST_PROTECTED_STORAGE``
          - ``PSA_API_TEST_INTERNAL_TRUSTED_STORAGE``
+         - ``PSA_API_TEST_STORAGE``
 
 .. code-block:: bash
 
@@ -241,6 +242,7 @@
          - ``PSA_API_TEST_CRYPTO``
          - ``PSA_API_TEST_PROTECTED_STORAGE``
          - ``PSA_API_TEST_INTERNAL_TRUSTED_STORAGE``
+         - ``PSA_API_TEST_STORAGE``
 
 .. code-block:: bash