Adding CMake build support.
diff --git a/api-tests/dev_apis/README.md b/api-tests/dev_apis/README.md
index 518fe60..6b8fabf 100644
--- a/api-tests/dev_apis/README.md
+++ b/api-tests/dev_apis/README.md
@@ -31,32 +31,35 @@
To build the test suite for your target platform, execute the following commands:
```
-cd api-tests
-./tools/scripts/setup.sh --target <platform_name> --cpu_arch <cpu_architecture_version> --suite <suite_name> --build <build_dir> --include <include_path> --archive_tests
+ cd api-tests
+ mkdir <build_dir>
+ cd <build_dir>
+ cmake ../ -G"<generator-name> -DTARGET=<platform_name> -DCPU_ARCH=<cpu_architecture_version> -DSUITE=<suite_name> -DPSA_INCLUDE_PATHS="<include_path1>;<include_path2>;...;<include_pathn>"
+ cmake --build .
```
<br /> where:
-- <platform_name> is the same as the name of the target-specific directory created in the **platform/targets/** directory. <br />
+- <generator-name> "Unix Makefiles" to generate Makefiles for Linux and Cygwin <br />
+ "MinGW Makefiles" to generate Makefiles for cmd.exe on Windows <br />
+- <platform_name> is the same as the name of the target-specific directory created in the **platform/targets/** directory. The current release has been tested on **tgt_dev_apis_tfm_an521**, **tgt_dev_apis_tfm_musca_b1** and **tgt_dev_apis_tfm_musca_a** platforms.<br />
- <cpu_architecture_version> is the Arm Architecture version name for which the tests should be compiled. For example, Armv7M, Armv8M-Baseline and Armv8M-Mainline Architecture. <br />
- <suite_name> is the suite name that is the same as the suite name available in **dev_apis/** directory. <br />
-- <build_dir> is a directory to store build output files. <br />
-- <include_path> is an additional directory to be included into the compiler search path. <br />
-Note: You must provide Developer APIs header file implementation to the test suite build system using this option. For example, to compile Crypto tests, the include path must point to the path where **psa/crypto.h** is located in your build system.<br />
-- Use **--archive_tests** option to create a combined test archive (**test_combine.a**) file by combining available test object files. Absence of this option creates a combined test binary (**test_elf_combine.bin**) by combining the available test ELF files.
+- <include_path1>;<include_path2>;...;<include_pathn> is an additional directory to be included into the compiler search path.You must provide Developer APIs header file implementation to the test suite build system using this option. For example, to compile Crypto tests, the include path must point to the path where **psa/crypto.h** is located in your build system.<br />
-For details about options, refer to **./tools/scripts/setup.sh --help**.
-
-To compile Crypto tests for **tgt_dev_apis_mbedos_fvp_mps2_m4** platform, execute the following commands:
+To compile Crypto tests for **tgt_dev_apis_tfm_an521** platform, execute the following commands:
```
-cd api-tests
-./tools/scripts/setup.sh --target tgt_dev_apis_mbedos_fvp_mps2_m4 --cpu_arch armv7m --suite crypto --build BUILD_CRYPTO --include <include_path> --archive_tests
+ cd api-tests
+ mkdir BUILD
+ cd BUILD
+ cmake ../ -G"Unix Makefiles" -DTARGET=tgt_dev_apis_tfm_an521 -DCPU_ARCH=armv8m_ml -DSUITE=CRYPTO -DPSA_INCLUDE_PATHS="<include_path1>;<include_path2>;...;<include_pathn>"
+ cmake --build .
```
### Build output
Building the test suite generates the following NSPE binaries:<br />
-- **<build_dir>/BUILD/val/val_nspe.a**
-- **<build_dir>/BUILD/platform/pal_nspe.a**
-- **<build_dir>/BUILD/dev_apis/<suite_name>/test_combine.a**
+- **<build_dir>/val/val_nspe.a**
+- **<build_dir>/platform/pal_nspe.a**
+- **<build_dir>/dev_apis/<suite_name>/test_combine.a**
### Integrating the libraries into your target platform
diff --git a/api-tests/dev_apis/crypto/suite.cmake b/api-tests/dev_apis/crypto/suite.cmake
new file mode 100644
index 0000000..ddb3128
--- /dev/null
+++ b/api-tests/dev_apis/crypto/suite.cmake
@@ -0,0 +1,56 @@
+#/** @file
+# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
+# * SPDX-License-Identifier : Apache-2.0
+# *
+# * Licensed under the Apache License, Version 2.0 (the "License");
+# * you may not use this file except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# * http://www.apache.org/licenses/LICENSE-2.0
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+#**/
+
+foreach(test ${PSA_TEST_LIST})
+ include(${PSA_SUITE_DIR}/${test}/test.cmake)
+ foreach(source_file ${CC_SOURCE})
+ list(APPEND SUITE_CC_SOURCE
+ ${PSA_SUITE_DIR}/${test}/${source_file}
+ )
+ endforeach()
+ foreach(asm_file ${AS_SOURCE})
+ list(APPEND SUITE_AS_SOURCE
+ ${PSA_SUITE_DIR}/${test}/${asm_file}
+ )
+ endforeach()
+ unset(CC_SOURCE)
+ unset(AS_SOURCE)
+endforeach()
+
+add_definitions(${CC_OPTIONS})
+add_definitions(${AS_OPTIONS})
+add_library(${PSA_TARGET_TEST_COMBINE_LIB} STATIC ${SUITE_CC_SOURCE} ${SUITE_AS_SOURCE})
+
+# Test related Include directories
+foreach(test ${PSA_TEST_LIST})
+ target_include_directories(${PSA_TARGET_TEST_COMBINE_LIB} PRIVATE ${PSA_SUITE_DIR}/${test})
+endforeach()
+
+# PSA Include directories
+foreach(psa_inc_path ${PSA_INCLUDE_PATHS})
+ target_include_directories(${PSA_TARGET_TEST_COMBINE_LIB} PRIVATE
+ ${psa_inc_path}
+ )
+endforeach()
+
+target_include_directories(${PSA_TARGET_TEST_COMBINE_LIB} PRIVATE
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${PSA_ROOT_DIR}/val/common
+ ${PSA_ROOT_DIR}/val/nspe
+ ${PSA_ROOT_DIR}/platform/targets/${TARGET}/nspe/common
+ ${PSA_ROOT_DIR}/platform/targets/${TARGET}/nspe/crypto
+)
diff --git a/api-tests/dev_apis/crypto/test_c001/source.mk b/api-tests/dev_apis/crypto/test_c001/source.mk
deleted file mode 100644
index f066e82..0000000
--- a/api-tests/dev_apis/crypto/test_c001/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2018, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c001.c test_c001.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c001/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/crypto/test_c001/test.cmake
index 627438f..bed11f8 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c001/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c001.c
+ test_c001.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/crypto/test_c002/source.mk b/api-tests/dev_apis/crypto/test_c002/source.mk
deleted file mode 100644
index b05e89a..0000000
--- a/api-tests/dev_apis/crypto/test_c002/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2018, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c002.c test_c002.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c002/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/crypto/test_c002/test.cmake
index 627438f..c4762aa 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c002/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c002.c
+ test_c002.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/crypto/test_c003/source.mk b/api-tests/dev_apis/crypto/test_c003/source.mk
deleted file mode 100644
index 6f21378..0000000
--- a/api-tests/dev_apis/crypto/test_c003/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2018, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c003.c test_c003.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c003/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/crypto/test_c003/test.cmake
index 627438f..4d1ef6b 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c003/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c003.c
+ test_c003.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/crypto/test_c004/source.mk b/api-tests/dev_apis/crypto/test_c004/source.mk
deleted file mode 100644
index 0c6aef1..0000000
--- a/api-tests/dev_apis/crypto/test_c004/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2018, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c004.c test_c004.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c004/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/crypto/test_c004/test.cmake
index 627438f..3107f11 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c004/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c004.c
+ test_c004.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/crypto/test_c005/source.mk b/api-tests/dev_apis/crypto/test_c005/source.mk
deleted file mode 100644
index 23bd36e..0000000
--- a/api-tests/dev_apis/crypto/test_c005/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2018, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c005.c test_c005.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c005/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/crypto/test_c005/test.cmake
index 627438f..33fc0a6 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c005/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c005.c
+ test_c005.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/crypto/test_c006/source.mk b/api-tests/dev_apis/crypto/test_c006/source.mk
deleted file mode 100644
index 11be5c5..0000000
--- a/api-tests/dev_apis/crypto/test_c006/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2018, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c006.c test_c006.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c006/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/crypto/test_c006/test.cmake
index 627438f..22db535 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c006/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c006.c
+ test_c006.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/crypto/test_c007/source.mk b/api-tests/dev_apis/crypto/test_c007/source.mk
deleted file mode 100644
index 3e76b14..0000000
--- a/api-tests/dev_apis/crypto/test_c007/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2018, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c007.c test_c007.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c007/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/crypto/test_c007/test.cmake
index 627438f..53b0625 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c007/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c007.c
+ test_c007.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/crypto/test_c008/source.mk b/api-tests/dev_apis/crypto/test_c008/source.mk
deleted file mode 100644
index 62d4727..0000000
--- a/api-tests/dev_apis/crypto/test_c008/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2018, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c008.c test_c008.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c008/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/crypto/test_c008/test.cmake
index 627438f..625227a 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c008/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c008.c
+ test_c008.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/crypto/test_c009/source.mk b/api-tests/dev_apis/crypto/test_c009/source.mk
deleted file mode 100644
index c865e8e..0000000
--- a/api-tests/dev_apis/crypto/test_c009/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2018, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c009.c test_c009.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c009/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/crypto/test_c009/test.cmake
index 627438f..93b0c94 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c009/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c009.c
+ test_c009.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/crypto/test_c010/source.mk b/api-tests/dev_apis/crypto/test_c010/source.mk
deleted file mode 100644
index 8b32fcf..0000000
--- a/api-tests/dev_apis/crypto/test_c010/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2018, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c010.c test_c010.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c010/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/crypto/test_c010/test.cmake
index 627438f..c3ca105 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c010/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c010.c
+ test_c010.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/crypto/test_c011/source.mk b/api-tests/dev_apis/crypto/test_c011/source.mk
deleted file mode 100644
index 4ab62a9..0000000
--- a/api-tests/dev_apis/crypto/test_c011/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2018, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c011.c test_c011.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c011/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/crypto/test_c011/test.cmake
index 627438f..7c2b04e 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c011/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c011.c
+ test_c011.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/crypto/test_c012/source.mk b/api-tests/dev_apis/crypto/test_c012/source.mk
deleted file mode 100644
index f6c4ec3..0000000
--- a/api-tests/dev_apis/crypto/test_c012/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2018, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c012.c test_c012.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c012/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/crypto/test_c012/test.cmake
index 627438f..9ea7f0d 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c012/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c012.c
+ test_c012.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/crypto/test_c013/source.mk b/api-tests/dev_apis/crypto/test_c013/source.mk
deleted file mode 100644
index 8d63e45..0000000
--- a/api-tests/dev_apis/crypto/test_c013/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2018, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c013.c test_c013.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c013/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/crypto/test_c013/test.cmake
index 627438f..3939d2c 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c013/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c013.c
+ test_c013.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/crypto/test_c014/source.mk b/api-tests/dev_apis/crypto/test_c014/source.mk
deleted file mode 100644
index 44a2bdb..0000000
--- a/api-tests/dev_apis/crypto/test_c014/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2018, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c014.c test_c014.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c014/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/crypto/test_c014/test.cmake
index 627438f..6bf060f 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c014/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c014.c
+ test_c014.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/crypto/test_c015/source.mk b/api-tests/dev_apis/crypto/test_c015/source.mk
deleted file mode 100644
index 70abb3c..0000000
--- a/api-tests/dev_apis/crypto/test_c015/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2018, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c015.c test_c015.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c015/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/crypto/test_c015/test.cmake
index 627438f..69bf742 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c015/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c015.c
+ test_c015.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/crypto/test_c016/source.mk b/api-tests/dev_apis/crypto/test_c016/source.mk
deleted file mode 100644
index f7d0b7e..0000000
--- a/api-tests/dev_apis/crypto/test_c016/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c016.c test_c016.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c016/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/crypto/test_c016/test.cmake
index 627438f..a4aa713 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c016/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c016.c
+ test_c016.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/crypto/test_c017/source.mk b/api-tests/dev_apis/crypto/test_c017/source.mk
deleted file mode 100644
index 6147e4c..0000000
--- a/api-tests/dev_apis/crypto/test_c017/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c017.c test_c017.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c017/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/crypto/test_c017/test.cmake
index 627438f..4314199 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c017/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c017.c
+ test_c017.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/crypto/test_c018/source.mk b/api-tests/dev_apis/crypto/test_c018/source.mk
deleted file mode 100644
index fbfbcae..0000000
--- a/api-tests/dev_apis/crypto/test_c018/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c018.c test_c018.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c018/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/crypto/test_c018/test.cmake
index 627438f..32d01a5 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c018/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c018.c
+ test_c018.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/crypto/test_c019/source.mk b/api-tests/dev_apis/crypto/test_c019/source.mk
deleted file mode 100644
index a0a473b..0000000
--- a/api-tests/dev_apis/crypto/test_c019/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c019.c test_c019.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c019/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/crypto/test_c019/test.cmake
index 627438f..c240558 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c019/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c019.c
+ test_c019.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/crypto/test_c020/source.mk b/api-tests/dev_apis/crypto/test_c020/source.mk
deleted file mode 100644
index accb40d..0000000
--- a/api-tests/dev_apis/crypto/test_c020/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c020.c test_c020.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c020/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/crypto/test_c020/test.cmake
index 627438f..8ceb228 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c020/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c020.c
+ test_c020.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/crypto/test_c021/source.mk b/api-tests/dev_apis/crypto/test_c021/source.mk
deleted file mode 100644
index 9761866..0000000
--- a/api-tests/dev_apis/crypto/test_c021/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c021.c test_c021.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c021/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/crypto/test_c021/test.cmake
index 627438f..e1a7891 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c021/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c021.c
+ test_c021.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/crypto/test_c022/source.mk b/api-tests/dev_apis/crypto/test_c022/source.mk
deleted file mode 100644
index 2ef3d73..0000000
--- a/api-tests/dev_apis/crypto/test_c022/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c022.c test_c022.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c022/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/crypto/test_c022/test.cmake
index 627438f..c095e55 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c022/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c022.c
+ test_c022.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/crypto/test_c023/source.mk b/api-tests/dev_apis/crypto/test_c023/source.mk
deleted file mode 100644
index bd0d7e7..0000000
--- a/api-tests/dev_apis/crypto/test_c023/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c023.c test_c023.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c023/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/crypto/test_c023/test.cmake
index 627438f..ceca9af 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c023/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c023.c
+ test_c023.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/crypto/test_c024/source.mk b/api-tests/dev_apis/crypto/test_c024/source.mk
deleted file mode 100644
index bfa9bee..0000000
--- a/api-tests/dev_apis/crypto/test_c024/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c024.c test_c024.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c024/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/crypto/test_c024/test.cmake
index 627438f..5904afc 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c024/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c024.c
+ test_c024.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/crypto/test_c025/source.mk b/api-tests/dev_apis/crypto/test_c025/source.mk
deleted file mode 100644
index e5ef05c..0000000
--- a/api-tests/dev_apis/crypto/test_c025/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c025.c test_c025.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c025/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/crypto/test_c025/test.cmake
index 627438f..af89d01 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c025/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c025.c
+ test_c025.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/crypto/test_c026/source.mk b/api-tests/dev_apis/crypto/test_c026/source.mk
deleted file mode 100644
index ab8acf2..0000000
--- a/api-tests/dev_apis/crypto/test_c026/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c026.c test_c026.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c026/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/crypto/test_c026/test.cmake
index 627438f..29ddd0a 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c026/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c026.c
+ test_c026.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/crypto/test_c027/source.mk b/api-tests/dev_apis/crypto/test_c027/source.mk
deleted file mode 100644
index 243dff7..0000000
--- a/api-tests/dev_apis/crypto/test_c027/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c027.c test_c027.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c027/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/crypto/test_c027/test.cmake
index 627438f..15623b7 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c027/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c027.c
+ test_c027.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/crypto/test_c028/source.mk b/api-tests/dev_apis/crypto/test_c028/source.mk
deleted file mode 100644
index f7dd193..0000000
--- a/api-tests/dev_apis/crypto/test_c028/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c028.c test_c028.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c028/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/crypto/test_c028/test.cmake
index 627438f..eae954e 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c028/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c028.c
+ test_c028.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/crypto/test_c029/source.mk b/api-tests/dev_apis/crypto/test_c029/source.mk
deleted file mode 100644
index 31b0f42..0000000
--- a/api-tests/dev_apis/crypto/test_c029/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c029.c test_c029.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c029/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/crypto/test_c029/test.cmake
index 627438f..112f7ab 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c029/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c029.c
+ test_c029.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/crypto/test_c030/source.mk b/api-tests/dev_apis/crypto/test_c030/source.mk
deleted file mode 100644
index 1cb3c47..0000000
--- a/api-tests/dev_apis/crypto/test_c030/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c030.c test_c030.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c030/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/crypto/test_c030/test.cmake
index 627438f..ba46882 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c030/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c030.c
+ test_c030.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/crypto/test_c031/source.mk b/api-tests/dev_apis/crypto/test_c031/source.mk
deleted file mode 100644
index be9d306..0000000
--- a/api-tests/dev_apis/crypto/test_c031/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c031.c test_c031.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c031/test.cmake
similarity index 82%
rename from api-tests/dev_apis/protected_storage/test_s005/source.mk
rename to api-tests/dev_apis/crypto/test_c031/test.cmake
index 627438f..5ff1ecf 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c031/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c031.c
+ test_c031.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/crypto/test_c032/source.mk b/api-tests/dev_apis/crypto/test_c032/source.mk
deleted file mode 100644
index 15305a1..0000000
--- a/api-tests/dev_apis/crypto/test_c032/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c032.c test_c032.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c032/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/crypto/test_c032/test.cmake
index 627438f..769b43e 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c032/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c032.c
+ test_c032.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/crypto/test_c033/source.mk b/api-tests/dev_apis/crypto/test_c033/source.mk
deleted file mode 100644
index e1925ed..0000000
--- a/api-tests/dev_apis/crypto/test_c033/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c033.c test_c033.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c033/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/crypto/test_c033/test.cmake
index 627438f..505bd9e 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c033/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c033.c
+ test_c033.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/crypto/test_c034/source.mk b/api-tests/dev_apis/crypto/test_c034/source.mk
deleted file mode 100644
index 48b0dde..0000000
--- a/api-tests/dev_apis/crypto/test_c034/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c034.c test_c034.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c034/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/crypto/test_c034/test.cmake
index 627438f..dac6246 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c034/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c034.c
+ test_c034.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/crypto/test_c035/source.mk b/api-tests/dev_apis/crypto/test_c035/source.mk
deleted file mode 100644
index b3318fe..0000000
--- a/api-tests/dev_apis/crypto/test_c035/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c035.c test_c035.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c035/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/crypto/test_c035/test.cmake
index 627438f..049eb98 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c035/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c035.c
+ test_c035.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/crypto/test_c036/source.mk b/api-tests/dev_apis/crypto/test_c036/source.mk
deleted file mode 100644
index 7a06132..0000000
--- a/api-tests/dev_apis/crypto/test_c036/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c036.c test_c036.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c036/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/crypto/test_c036/test.cmake
index 627438f..e8b9666 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c036/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c036.c
+ test_c036.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/crypto/test_c037/source.mk b/api-tests/dev_apis/crypto/test_c037/source.mk
deleted file mode 100644
index 0915b8a..0000000
--- a/api-tests/dev_apis/crypto/test_c037/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c037.c test_c037.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c037/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/crypto/test_c037/test.cmake
index 627438f..0a6a24b 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c037/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c037.c
+ test_c037.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/crypto/test_c038/source.mk b/api-tests/dev_apis/crypto/test_c038/source.mk
deleted file mode 100644
index 2f6d4f0..0000000
--- a/api-tests/dev_apis/crypto/test_c038/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c038.c test_c038.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c038/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/crypto/test_c038/test.cmake
index 627438f..59a6c5e 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c038/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c038.c
+ test_c038.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c039/source.mk
deleted file mode 100644
index 710a57c..0000000
--- a/api-tests/dev_apis/crypto/test_c039/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c039.c test_c039.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c039/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/crypto/test_c039/test.cmake
index 627438f..3ed4781 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c039/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c039.c
+ test_c039.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/crypto/test_c040/source.mk b/api-tests/dev_apis/crypto/test_c040/source.mk
deleted file mode 100644
index 8033ae4..0000000
--- a/api-tests/dev_apis/crypto/test_c040/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c040.c test_c040.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c040/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/crypto/test_c040/test.cmake
index 627438f..3d33945 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c040/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c040.c
+ test_c040.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/crypto/test_c041/source.mk b/api-tests/dev_apis/crypto/test_c041/source.mk
deleted file mode 100644
index 1263a66..0000000
--- a/api-tests/dev_apis/crypto/test_c041/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c041.c test_c041.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c041/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/crypto/test_c041/test.cmake
index 627438f..0e96d93 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c041/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c041.c
+ test_c041.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/crypto/test_c042/source.mk b/api-tests/dev_apis/crypto/test_c042/source.mk
deleted file mode 100644
index 570ce55..0000000
--- a/api-tests/dev_apis/crypto/test_c042/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c042.c test_c042.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c042/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/crypto/test_c042/test.cmake
index 627438f..f67e12f 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c042/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c042.c
+ test_c042.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/crypto/test_c043/source.mk b/api-tests/dev_apis/crypto/test_c043/source.mk
deleted file mode 100644
index 9e58f79..0000000
--- a/api-tests/dev_apis/crypto/test_c043/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c043.c test_c043.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c043/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/crypto/test_c043/test.cmake
index 627438f..42e185d 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c043/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c043.c
+ test_c043.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/crypto/test_c044/source.mk b/api-tests/dev_apis/crypto/test_c044/source.mk
deleted file mode 100644
index f205658..0000000
--- a/api-tests/dev_apis/crypto/test_c044/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_c044.c test_c044.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/crypto/test_c044/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/crypto/test_c044/test.cmake
index 627438f..0ceea82 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/crypto/test_c044/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_c044.c
+ test_c044.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/initial_attestation/suite.cmake b/api-tests/dev_apis/initial_attestation/suite.cmake
new file mode 100644
index 0000000..ddb3128
--- /dev/null
+++ b/api-tests/dev_apis/initial_attestation/suite.cmake
@@ -0,0 +1,56 @@
+#/** @file
+# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
+# * SPDX-License-Identifier : Apache-2.0
+# *
+# * Licensed under the Apache License, Version 2.0 (the "License");
+# * you may not use this file except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# * http://www.apache.org/licenses/LICENSE-2.0
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+#**/
+
+foreach(test ${PSA_TEST_LIST})
+ include(${PSA_SUITE_DIR}/${test}/test.cmake)
+ foreach(source_file ${CC_SOURCE})
+ list(APPEND SUITE_CC_SOURCE
+ ${PSA_SUITE_DIR}/${test}/${source_file}
+ )
+ endforeach()
+ foreach(asm_file ${AS_SOURCE})
+ list(APPEND SUITE_AS_SOURCE
+ ${PSA_SUITE_DIR}/${test}/${asm_file}
+ )
+ endforeach()
+ unset(CC_SOURCE)
+ unset(AS_SOURCE)
+endforeach()
+
+add_definitions(${CC_OPTIONS})
+add_definitions(${AS_OPTIONS})
+add_library(${PSA_TARGET_TEST_COMBINE_LIB} STATIC ${SUITE_CC_SOURCE} ${SUITE_AS_SOURCE})
+
+# Test related Include directories
+foreach(test ${PSA_TEST_LIST})
+ target_include_directories(${PSA_TARGET_TEST_COMBINE_LIB} PRIVATE ${PSA_SUITE_DIR}/${test})
+endforeach()
+
+# PSA Include directories
+foreach(psa_inc_path ${PSA_INCLUDE_PATHS})
+ target_include_directories(${PSA_TARGET_TEST_COMBINE_LIB} PRIVATE
+ ${psa_inc_path}
+ )
+endforeach()
+
+target_include_directories(${PSA_TARGET_TEST_COMBINE_LIB} PRIVATE
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${PSA_ROOT_DIR}/val/common
+ ${PSA_ROOT_DIR}/val/nspe
+ ${PSA_ROOT_DIR}/platform/targets/${TARGET}/nspe/common
+ ${PSA_ROOT_DIR}/platform/targets/${TARGET}/nspe/crypto
+)
diff --git a/api-tests/dev_apis/initial_attestation/test_a001/source.mk b/api-tests/dev_apis/initial_attestation/test_a001/source.mk
deleted file mode 100644
index 601bde9..0000000
--- a/api-tests/dev_apis/initial_attestation/test_a001/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_a001.c test_a001.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/initial_attestation/test_a001/test.cmake
similarity index 82%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/initial_attestation/test_a001/test.cmake
index 627438f..55df1fa 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/initial_attestation/test_a001/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_a001.c
+ test_a001.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/internal_trusted_storage/suite.cmake b/api-tests/dev_apis/internal_trusted_storage/suite.cmake
new file mode 100644
index 0000000..e4de40c
--- /dev/null
+++ b/api-tests/dev_apis/internal_trusted_storage/suite.cmake
@@ -0,0 +1,57 @@
+#/** @file
+# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
+# * SPDX-License-Identifier : Apache-2.0
+# *
+# * Licensed under the Apache License, Version 2.0 (the "License");
+# * you may not use this file except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# * http://www.apache.org/licenses/LICENSE-2.0
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+#**/
+
+foreach(test ${PSA_TEST_LIST})
+ include(${PSA_SUITE_DIR}/${test}/test.cmake)
+ foreach(source_file ${CC_SOURCE})
+ list(APPEND SUITE_CC_SOURCE
+ ${PSA_SUITE_DIR}/${test}/${source_file}
+ )
+ endforeach()
+ foreach(asm_file ${AS_SOURCE})
+ list(APPEND SUITE_AS_SOURCE
+ ${PSA_SUITE_DIR}/${test}/${asm_file}
+ )
+ endforeach()
+ unset(CC_SOURCE)
+ unset(AS_SOURCE)
+endforeach()
+
+add_definitions(${CC_OPTIONS})
+add_definitions(${AS_OPTIONS})
+add_library(${PSA_TARGET_TEST_COMBINE_LIB} STATIC ${SUITE_CC_SOURCE} ${SUITE_AS_SOURCE})
+
+# Test related Include directories
+foreach(test ${PSA_TEST_LIST})
+ target_include_directories(${PSA_TARGET_TEST_COMBINE_LIB} PRIVATE ${PSA_SUITE_DIR}/${test})
+endforeach()
+
+# PSA Include directories
+foreach(psa_inc_path ${PSA_INCLUDE_PATHS})
+ target_include_directories(${PSA_TARGET_TEST_COMBINE_LIB} PRIVATE
+ ${psa_inc_path}
+ )
+endforeach()
+
+target_include_directories(${PSA_TARGET_TEST_COMBINE_LIB} PRIVATE
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${PSA_ROOT_DIR}/val/common
+ ${PSA_ROOT_DIR}/val/nspe
+ ${PSA_ROOT_DIR}/platform/targets/${TARGET}/nspe/common
+ ${PSA_ROOT_DIR}/platform/targets/${TARGET}/nspe/crypto
+ ${PSA_ROOT_DIR}/platform/targets/${TARGET}/nspe/internal_trusted_storage
+)
diff --git a/api-tests/dev_apis/internal_trusted_storage/test_s001/source.mk b/api-tests/dev_apis/internal_trusted_storage/test_s001/source.mk
deleted file mode 100644
index 14e152d..0000000
--- a/api-tests/dev_apis/internal_trusted_storage/test_s001/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_s001.c test_s001.c
-CC_OPTIONS = -DITS_TEST
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/internal_trusted_storage/test_s001/test.cmake
similarity index 81%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/internal_trusted_storage/test_s001/test.cmake
index 627438f..fb61ac1 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/internal_trusted_storage/test_s001/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_s001.c
+ test_s001.c
+)
+list(APPEND CC_OPTIONS -DITS_TEST)
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/internal_trusted_storage/test_s002/source.mk b/api-tests/dev_apis/internal_trusted_storage/test_s002/source.mk
deleted file mode 100755
index abc1a1f..0000000
--- a/api-tests/dev_apis/internal_trusted_storage/test_s002/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_s002.c test_s002.c
-CC_OPTIONS = -DITS_TEST
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/internal_trusted_storage/test_s002/test.cmake
similarity index 81%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/internal_trusted_storage/test_s002/test.cmake
index 627438f..e8cfe6a 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/internal_trusted_storage/test_s002/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_s002.c
+ test_s002.c
+)
+list(APPEND CC_OPTIONS -DITS_TEST)
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/internal_trusted_storage/test_s003/source.mk b/api-tests/dev_apis/internal_trusted_storage/test_s003/source.mk
deleted file mode 100755
index d24a930..0000000
--- a/api-tests/dev_apis/internal_trusted_storage/test_s003/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_s003.c test_s003.c
-CC_OPTIONS = -DITS_TEST
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/internal_trusted_storage/test_s003/test.cmake
similarity index 81%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/internal_trusted_storage/test_s003/test.cmake
index 627438f..da2f1ad 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/internal_trusted_storage/test_s003/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_s003.c
+ test_s003.c
+)
+list(APPEND CC_OPTIONS -DITS_TEST)
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/internal_trusted_storage/test_s004/source.mk b/api-tests/dev_apis/internal_trusted_storage/test_s004/source.mk
deleted file mode 100755
index 804d4e5..0000000
--- a/api-tests/dev_apis/internal_trusted_storage/test_s004/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_s004.c test_s004.c
-CC_OPTIONS = -DITS_TEST
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/internal_trusted_storage/test_s004/test.cmake
similarity index 81%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/internal_trusted_storage/test_s004/test.cmake
index 627438f..88caf83 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/internal_trusted_storage/test_s004/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_s004.c
+ test_s004.c
+)
+list(APPEND CC_OPTIONS -DITS_TEST)
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/internal_trusted_storage/test_s005/source.mk b/api-tests/dev_apis/internal_trusted_storage/test_s005/source.mk
deleted file mode 100755
index 1f9a30e..0000000
--- a/api-tests/dev_apis/internal_trusted_storage/test_s005/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DITS_TEST
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/internal_trusted_storage/test_s005/test.cmake
similarity index 81%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/internal_trusted_storage/test_s005/test.cmake
index 627438f..33559cb 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/internal_trusted_storage/test_s005/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_s005.c
+ test_s005.c
+)
+list(APPEND CC_OPTIONS -DITS_TEST)
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/internal_trusted_storage/test_s006/source.mk b/api-tests/dev_apis/internal_trusted_storage/test_s006/source.mk
deleted file mode 100755
index 3b64b74..0000000
--- a/api-tests/dev_apis/internal_trusted_storage/test_s006/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_s006.c test_s006.c
-CC_OPTIONS = -DITS_TEST
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/internal_trusted_storage/test_s006/test.cmake
similarity index 81%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/internal_trusted_storage/test_s006/test.cmake
index 627438f..7810ff6 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/internal_trusted_storage/test_s006/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_s006.c
+ test_s006.c
+)
+list(APPEND CC_OPTIONS -DITS_TEST)
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/internal_trusted_storage/test_s007/source.mk b/api-tests/dev_apis/internal_trusted_storage/test_s007/source.mk
deleted file mode 100755
index 4ba5f69..0000000
--- a/api-tests/dev_apis/internal_trusted_storage/test_s007/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_s007.c test_s007.c
-CC_OPTIONS = -DITS_TEST
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/internal_trusted_storage/test_s007/test.cmake
similarity index 81%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/internal_trusted_storage/test_s007/test.cmake
index 627438f..cee8525 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/internal_trusted_storage/test_s007/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_s007.c
+ test_s007.c
+)
+list(APPEND CC_OPTIONS -DITS_TEST)
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/internal_trusted_storage/test_s008/source.mk b/api-tests/dev_apis/internal_trusted_storage/test_s008/source.mk
deleted file mode 100755
index b1ec445..0000000
--- a/api-tests/dev_apis/internal_trusted_storage/test_s008/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_s008.c test_s008.c
-CC_OPTIONS = -DITS_TEST
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/internal_trusted_storage/test_s008/test.cmake
similarity index 81%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/internal_trusted_storage/test_s008/test.cmake
index 627438f..ecba9c3 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/internal_trusted_storage/test_s008/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_s008.c
+ test_s008.c
+)
+list(APPEND CC_OPTIONS -DITS_TEST)
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/internal_trusted_storage/test_s009/source.mk b/api-tests/dev_apis/internal_trusted_storage/test_s009/source.mk
deleted file mode 100755
index 639ba27..0000000
--- a/api-tests/dev_apis/internal_trusted_storage/test_s009/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_s009.c test_s009.c
-CC_OPTIONS = -DITS_TEST
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/internal_trusted_storage/test_s009/test.cmake
similarity index 81%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/internal_trusted_storage/test_s009/test.cmake
index 627438f..e5fe7ee 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/internal_trusted_storage/test_s009/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_s009.c
+ test_s009.c
+)
+list(APPEND CC_OPTIONS -DITS_TEST)
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/internal_trusted_storage/test_s010/source.mk b/api-tests/dev_apis/internal_trusted_storage/test_s010/source.mk
deleted file mode 100644
index 9824203..0000000
--- a/api-tests/dev_apis/internal_trusted_storage/test_s010/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_s010.c test_s010.c
-CC_OPTIONS = -DITS_TEST
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/internal_trusted_storage/test_s010/test.cmake
similarity index 81%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/internal_trusted_storage/test_s010/test.cmake
index 627438f..4c3dc6a 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/internal_trusted_storage/test_s010/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_s010.c
+ test_s010.c
+)
+list(APPEND CC_OPTIONS -DITS_TEST)
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/protected_storage/suite.cmake b/api-tests/dev_apis/protected_storage/suite.cmake
new file mode 100644
index 0000000..2dc9b5b
--- /dev/null
+++ b/api-tests/dev_apis/protected_storage/suite.cmake
@@ -0,0 +1,78 @@
+#/** @file
+# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
+# * SPDX-License-Identifier : Apache-2.0
+# *
+# * Licensed under the Apache License, Version 2.0 (the "License");
+# * you may not use this file except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# * http://www.apache.org/licenses/LICENSE-2.0
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+#**/
+
+foreach(test ${PSA_TEST_LIST})
+ string(SUBSTRING ${test} 0 6 ITS_TEST_STR)
+ if((${SUITE} STREQUAL "PROTECTED_STORAGE") AND
+ (${ITS_TEST_STR} STREQUAL "test_s"))
+ string(REPLACE ${SUITE_LOWER} "internal_trusted_storage" ACTUAL_PSA_SUITE_DIR ${PSA_SUITE_DIR})
+ else()
+ set(ACTUAL_PSA_SUITE_DIR ${PSA_SUITE_DIR})
+ endif()
+ include(${ACTUAL_PSA_SUITE_DIR}/${test}/test.cmake)
+ foreach(source_file ${CC_SOURCE})
+ list(APPEND SUITE_CC_SOURCE
+ ${ACTUAL_PSA_SUITE_DIR}/${test}/${source_file}
+ )
+ endforeach()
+ foreach(asm_file ${AS_SOURCE})
+ list(APPEND SUITE_AS_SOURCE
+ ${ACTUAL_PSA_SUITE_DIR}/${test}/${asm_file}
+ )
+ endforeach()
+ if((${SUITE} STREQUAL "PROTECTED_STORAGE") AND
+ (${ITS_TEST_STR} STREQUAL "test_p"))
+ add_definitions(${CC_OPTIONS})
+ add_definitions(${AS_OPTIONS})
+ endif()
+ unset(CC_SOURCE)
+ unset(AS_SOURCE)
+ unset(ACTUAL_PSA_SUITE_DIR)
+ unset(CC_OPTIONS)
+endforeach()
+
+add_library(${PSA_TARGET_TEST_COMBINE_LIB} STATIC ${SUITE_CC_SOURCE} ${SUITE_AS_SOURCE})
+
+# Test related Include directories
+foreach(test ${PSA_TEST_LIST})
+ string(SUBSTRING ${test} 0 6 ITS_TEST_STR)
+ if((${SUITE} STREQUAL "PROTECTED_STORAGE") AND
+ (${ITS_TEST_STR} STREQUAL "test_s"))
+ string(REPLACE ${SUITE_LOWER} "internal_trusted_storage" ACTUAL_PSA_SUITE_DIR ${PSA_SUITE_DIR})
+ else()
+ set(ACTUAL_PSA_SUITE_DIR ${PSA_SUITE_DIR})
+ endif()
+ target_include_directories(${PSA_TARGET_TEST_COMBINE_LIB} PRIVATE ${ACTUAL_PSA_SUITE_DIR}/${test})
+ unset(ACTUAL_PSA_SUITE_DIR)
+endforeach()
+
+# PSA Include directories
+foreach(psa_inc_path ${PSA_INCLUDE_PATHS})
+ target_include_directories(${PSA_TARGET_TEST_COMBINE_LIB} PRIVATE
+ ${psa_inc_path}
+ )
+endforeach()
+
+target_include_directories(${PSA_TARGET_TEST_COMBINE_LIB} PRIVATE
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${PSA_ROOT_DIR}/val/common
+ ${PSA_ROOT_DIR}/val/nspe
+ ${PSA_ROOT_DIR}/platform/targets/${TARGET}/nspe/common
+ ${PSA_ROOT_DIR}/platform/targets/${TARGET}/nspe/crypto
+ ${PSA_ROOT_DIR}/platform/targets/${TARGET}/nspe/protected_storage
+ ${PSA_ROOT_DIR}/platform/targets/${TARGET}/nspe/internal_trusted_storage
+)
diff --git a/api-tests/dev_apis/protected_storage/test_p011/source.mk b/api-tests/dev_apis/protected_storage/test_p011/source.mk
deleted file mode 100644
index beb30be..0000000
--- a/api-tests/dev_apis/protected_storage/test_p011/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_p011.c test_p011.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/protected_storage/test_p011/test.cmake
similarity index 81%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/protected_storage/test_p011/test.cmake
index 627438f..67884da 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/protected_storage/test_p011/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_p011.c
+ test_p011.c
+)
+list(APPEND CC_OPTIONS -DPS_TEST)
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/protected_storage/test_p012/source.mk b/api-tests/dev_apis/protected_storage/test_p012/source.mk
deleted file mode 100644
index 1820ace..0000000
--- a/api-tests/dev_apis/protected_storage/test_p012/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_p012.c test_p012.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/protected_storage/test_p012/test.cmake
similarity index 81%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/protected_storage/test_p012/test.cmake
index 627438f..28b4103 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/protected_storage/test_p012/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_p012.c
+ test_p012.c
+)
+list(APPEND CC_OPTIONS -DPS_TEST)
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/protected_storage/test_p013/source.mk b/api-tests/dev_apis/protected_storage/test_p013/source.mk
deleted file mode 100644
index c966717..0000000
--- a/api-tests/dev_apis/protected_storage/test_p013/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_p013.c test_p013.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/protected_storage/test_p013/test.cmake
similarity index 81%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/protected_storage/test_p013/test.cmake
index 627438f..6c1913f 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/protected_storage/test_p013/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_p013.c
+ test_p013.c
+)
+list(APPEND CC_OPTIONS -DPS_TEST)
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/protected_storage/test_p014/source.mk b/api-tests/dev_apis/protected_storage/test_p014/source.mk
deleted file mode 100644
index 931b670..0000000
--- a/api-tests/dev_apis/protected_storage/test_p014/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_p014.c test_p014.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/protected_storage/test_p014/test.cmake
similarity index 81%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/protected_storage/test_p014/test.cmake
index 627438f..a794d8c 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/protected_storage/test_p014/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_p014.c
+ test_p014.c
+)
+list(APPEND CC_OPTIONS -DPS_TEST)
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/protected_storage/test_p015/source.mk b/api-tests/dev_apis/protected_storage/test_p015/source.mk
deleted file mode 100644
index 81b14e9..0000000
--- a/api-tests/dev_apis/protected_storage/test_p015/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_p015.c test_p015.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/protected_storage/test_p015/test.cmake
similarity index 81%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/protected_storage/test_p015/test.cmake
index 627438f..b2a8b62 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/protected_storage/test_p015/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_p015.c
+ test_p015.c
+)
+list(APPEND CC_OPTIONS -DPS_TEST)
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/protected_storage/test_s001/source.mk b/api-tests/dev_apis/protected_storage/test_s001/source.mk
deleted file mode 100644
index 6a92d9f..0000000
--- a/api-tests/dev_apis/protected_storage/test_s001/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_s001.c test_s001.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/protected_storage/test_s001/test.cmake
similarity index 81%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/protected_storage/test_s001/test.cmake
index 627438f..ee15ef4 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/protected_storage/test_s001/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_s001.c
+ test_s001.c
+)
+list(APPEND CC_OPTIONS -DPS_TEST)
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/protected_storage/test_s002/source.mk b/api-tests/dev_apis/protected_storage/test_s002/source.mk
deleted file mode 100644
index 3d5771c..0000000
--- a/api-tests/dev_apis/protected_storage/test_s002/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_s002.c test_s002.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/protected_storage/test_s002/test.cmake
similarity index 81%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/protected_storage/test_s002/test.cmake
index 627438f..c588caa 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/protected_storage/test_s002/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_s002.c
+ test_s002.c
+)
+list(APPEND CC_OPTIONS -DPS_TEST)
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/protected_storage/test_s003/source.mk b/api-tests/dev_apis/protected_storage/test_s003/source.mk
deleted file mode 100644
index afdb886..0000000
--- a/api-tests/dev_apis/protected_storage/test_s003/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_s003.c test_s003.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/protected_storage/test_s003/test.cmake
similarity index 81%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/protected_storage/test_s003/test.cmake
index 627438f..6a38d56 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/protected_storage/test_s003/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_s003.c
+ test_s003.c
+)
+list(APPEND CC_OPTIONS -DPS_TEST)
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/protected_storage/test_s004/source.mk b/api-tests/dev_apis/protected_storage/test_s004/source.mk
deleted file mode 100644
index c73824d..0000000
--- a/api-tests/dev_apis/protected_storage/test_s004/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_s004.c test_s004.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/protected_storage/test_s004/test.cmake
similarity index 81%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/protected_storage/test_s004/test.cmake
index 627438f..1210631 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/protected_storage/test_s004/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_s004.c
+ test_s004.c
+)
+list(APPEND CC_OPTIONS -DPS_TEST)
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/protected_storage/test_s005/test.cmake
similarity index 81%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/protected_storage/test_s005/test.cmake
index 627438f..bf3786a 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/protected_storage/test_s005/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_s005.c
+ test_s005.c
+)
+list(APPEND CC_OPTIONS -DPS_TEST)
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/protected_storage/test_s006/source.mk b/api-tests/dev_apis/protected_storage/test_s006/source.mk
deleted file mode 100644
index b64fb21..0000000
--- a/api-tests/dev_apis/protected_storage/test_s006/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_s006.c test_s006.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/protected_storage/test_s006/test.cmake
similarity index 81%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/protected_storage/test_s006/test.cmake
index 627438f..c661ac3 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/protected_storage/test_s006/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_s006.c
+ test_s006.c
+)
+list(APPEND CC_OPTIONS -DPS_TEST)
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/protected_storage/test_s007/source.mk b/api-tests/dev_apis/protected_storage/test_s007/source.mk
deleted file mode 100644
index 2e242cc..0000000
--- a/api-tests/dev_apis/protected_storage/test_s007/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_s007.c test_s007.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/protected_storage/test_s007/test.cmake
similarity index 81%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/protected_storage/test_s007/test.cmake
index 627438f..5c6606d 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/protected_storage/test_s007/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_s007.c
+ test_s007.c
+)
+list(APPEND CC_OPTIONS -DPS_TEST)
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/protected_storage/test_s008/source.mk b/api-tests/dev_apis/protected_storage/test_s008/source.mk
deleted file mode 100644
index 1e8bc76..0000000
--- a/api-tests/dev_apis/protected_storage/test_s008/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_s008.c test_s008.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/protected_storage/test_s008/test.cmake
similarity index 81%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/protected_storage/test_s008/test.cmake
index 627438f..b91d92d 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/protected_storage/test_s008/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_s008.c
+ test_s008.c
+)
+list(APPEND CC_OPTIONS -DPS_TEST)
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/protected_storage/test_s009/source.mk b/api-tests/dev_apis/protected_storage/test_s009/source.mk
deleted file mode 100644
index 5a2c3b0..0000000
--- a/api-tests/dev_apis/protected_storage/test_s009/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_s009.c test_s009.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/protected_storage/test_s009/test.cmake
similarity index 81%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/protected_storage/test_s009/test.cmake
index 627438f..9d66436 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/protected_storage/test_s009/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_s009.c
+ test_s009.c
+)
+list(APPEND CC_OPTIONS -DPS_TEST)
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
diff --git a/api-tests/dev_apis/protected_storage/test_s010/source.mk b/api-tests/dev_apis/protected_storage/test_s010/source.mk
deleted file mode 100644
index e0b22d5..0000000
--- a/api-tests/dev_apis/protected_storage/test_s010/source.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
-# * SPDX-License-Identifier : Apache-2.0
-# *
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-#**/
-
-CC_SOURCE = test_entry_s010.c test_s010.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
diff --git a/api-tests/dev_apis/protected_storage/test_s005/source.mk b/api-tests/dev_apis/protected_storage/test_s010/test.cmake
similarity index 81%
copy from api-tests/dev_apis/protected_storage/test_s005/source.mk
copy to api-tests/dev_apis/protected_storage/test_s010/test.cmake
index 627438f..b36e23f 100644
--- a/api-tests/dev_apis/protected_storage/test_s005/source.mk
+++ b/api-tests/dev_apis/protected_storage/test_s010/test.cmake
@@ -1,3 +1,4 @@
+#/** @file
# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
@@ -14,7 +15,10 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_s005.c test_s005.c
-CC_OPTIONS = -DPS_TEST
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_s010.c
+ test_s010.c
+)
+list(APPEND CC_OPTIONS -DPS_TEST)
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )