Adding CMake build support.
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/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c001/test.cmake
similarity index 82%
copy from api-tests/dev_apis/crypto/test_c039/source.mk
copy to api-tests/dev_apis/crypto/test_c001/test.cmake
index 710a57c..bed11f8 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c002/test.cmake
similarity index 82%
copy from api-tests/dev_apis/crypto/test_c039/source.mk
copy to api-tests/dev_apis/crypto/test_c002/test.cmake
index 710a57c..c4762aa 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c003/test.cmake
similarity index 82%
copy from api-tests/dev_apis/crypto/test_c039/source.mk
copy to api-tests/dev_apis/crypto/test_c003/test.cmake
index 710a57c..4d1ef6b 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c004/test.cmake
similarity index 82%
copy from api-tests/dev_apis/crypto/test_c039/source.mk
copy to api-tests/dev_apis/crypto/test_c004/test.cmake
index 710a57c..3107f11 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c005/test.cmake
similarity index 82%
copy from api-tests/dev_apis/crypto/test_c039/source.mk
copy to api-tests/dev_apis/crypto/test_c005/test.cmake
index 710a57c..33fc0a6 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c006/test.cmake
similarity index 82%
copy from api-tests/dev_apis/crypto/test_c039/source.mk
copy to api-tests/dev_apis/crypto/test_c006/test.cmake
index 710a57c..22db535 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c007/test.cmake
similarity index 82%
copy from api-tests/dev_apis/crypto/test_c039/source.mk
copy to api-tests/dev_apis/crypto/test_c007/test.cmake
index 710a57c..53b0625 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c008/test.cmake
similarity index 82%
copy from api-tests/dev_apis/crypto/test_c039/source.mk
copy to api-tests/dev_apis/crypto/test_c008/test.cmake
index 710a57c..625227a 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c009/test.cmake
similarity index 82%
copy from api-tests/dev_apis/crypto/test_c039/source.mk
copy to api-tests/dev_apis/crypto/test_c009/test.cmake
index 710a57c..93b0c94 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c010/test.cmake
similarity index 82%
copy from api-tests/dev_apis/crypto/test_c039/source.mk
copy to api-tests/dev_apis/crypto/test_c010/test.cmake
index 710a57c..c3ca105 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c011/test.cmake
similarity index 82%
copy from api-tests/dev_apis/crypto/test_c039/source.mk
copy to api-tests/dev_apis/crypto/test_c011/test.cmake
index 710a57c..7c2b04e 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c012/test.cmake
similarity index 82%
copy from api-tests/dev_apis/crypto/test_c039/source.mk
copy to api-tests/dev_apis/crypto/test_c012/test.cmake
index 710a57c..9ea7f0d 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c013/test.cmake
similarity index 82%
copy from api-tests/dev_apis/crypto/test_c039/source.mk
copy to api-tests/dev_apis/crypto/test_c013/test.cmake
index 710a57c..3939d2c 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c014/test.cmake
similarity index 82%
copy from api-tests/dev_apis/crypto/test_c039/source.mk
copy to api-tests/dev_apis/crypto/test_c014/test.cmake
index 710a57c..6bf060f 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c015/test.cmake
similarity index 82%
copy from api-tests/dev_apis/crypto/test_c039/source.mk
copy to api-tests/dev_apis/crypto/test_c015/test.cmake
index 710a57c..69bf742 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c016/test.cmake
similarity index 82%
copy from api-tests/dev_apis/crypto/test_c039/source.mk
copy to api-tests/dev_apis/crypto/test_c016/test.cmake
index 710a57c..a4aa713 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c017/test.cmake
similarity index 82%
copy from api-tests/dev_apis/crypto/test_c039/source.mk
copy to api-tests/dev_apis/crypto/test_c017/test.cmake
index 710a57c..4314199 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c018/test.cmake
similarity index 82%
copy from api-tests/dev_apis/crypto/test_c039/source.mk
copy to api-tests/dev_apis/crypto/test_c018/test.cmake
index 710a57c..32d01a5 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c019/test.cmake
similarity index 82%
rename from api-tests/dev_apis/crypto/test_c039/source.mk
rename to api-tests/dev_apis/crypto/test_c019/test.cmake
index 710a57c..c240558 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c020/test.cmake
similarity index 82%
copy from api-tests/dev_apis/crypto/test_c039/source.mk
copy to api-tests/dev_apis/crypto/test_c020/test.cmake
index 710a57c..8ceb228 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c021/test.cmake
similarity index 82%
copy from api-tests/dev_apis/crypto/test_c039/source.mk
copy to api-tests/dev_apis/crypto/test_c021/test.cmake
index 710a57c..e1a7891 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c022/test.cmake
similarity index 82%
copy from api-tests/dev_apis/crypto/test_c039/source.mk
copy to api-tests/dev_apis/crypto/test_c022/test.cmake
index 710a57c..c095e55 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c023/test.cmake
similarity index 82%
copy from api-tests/dev_apis/crypto/test_c039/source.mk
copy to api-tests/dev_apis/crypto/test_c023/test.cmake
index 710a57c..ceca9af 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c024/test.cmake
similarity index 82%
copy from api-tests/dev_apis/crypto/test_c039/source.mk
copy to api-tests/dev_apis/crypto/test_c024/test.cmake
index 710a57c..5904afc 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c025/test.cmake
similarity index 82%
copy from api-tests/dev_apis/crypto/test_c039/source.mk
copy to api-tests/dev_apis/crypto/test_c025/test.cmake
index 710a57c..af89d01 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c026/test.cmake
similarity index 82%
copy from api-tests/dev_apis/crypto/test_c039/source.mk
copy to api-tests/dev_apis/crypto/test_c026/test.cmake
index 710a57c..29ddd0a 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c027/test.cmake
similarity index 82%
copy from api-tests/dev_apis/crypto/test_c039/source.mk
copy to api-tests/dev_apis/crypto/test_c027/test.cmake
index 710a57c..15623b7 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c028/test.cmake
similarity index 82%
copy from api-tests/dev_apis/crypto/test_c039/source.mk
copy to api-tests/dev_apis/crypto/test_c028/test.cmake
index 710a57c..eae954e 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c029/test.cmake
similarity index 82%
copy from api-tests/dev_apis/crypto/test_c039/source.mk
copy to api-tests/dev_apis/crypto/test_c029/test.cmake
index 710a57c..112f7ab 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c030/test.cmake
similarity index 82%
copy from api-tests/dev_apis/crypto/test_c039/source.mk
copy to api-tests/dev_apis/crypto/test_c030/test.cmake
index 710a57c..ba46882 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c031/test.cmake
similarity index 82%
copy from api-tests/dev_apis/crypto/test_c039/source.mk
copy to api-tests/dev_apis/crypto/test_c031/test.cmake
index 710a57c..5ff1ecf 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c032/test.cmake
similarity index 82%
copy from api-tests/dev_apis/crypto/test_c039/source.mk
copy to api-tests/dev_apis/crypto/test_c032/test.cmake
index 710a57c..769b43e 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c033/test.cmake
similarity index 82%
copy from api-tests/dev_apis/crypto/test_c039/source.mk
copy to api-tests/dev_apis/crypto/test_c033/test.cmake
index 710a57c..505bd9e 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c034/test.cmake
similarity index 82%
copy from api-tests/dev_apis/crypto/test_c039/source.mk
copy to api-tests/dev_apis/crypto/test_c034/test.cmake
index 710a57c..dac6246 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c035/test.cmake
similarity index 82%
copy from api-tests/dev_apis/crypto/test_c039/source.mk
copy to api-tests/dev_apis/crypto/test_c035/test.cmake
index 710a57c..049eb98 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c036/test.cmake
similarity index 82%
copy from api-tests/dev_apis/crypto/test_c039/source.mk
copy to api-tests/dev_apis/crypto/test_c036/test.cmake
index 710a57c..e8b9666 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c037/test.cmake
similarity index 82%
copy from api-tests/dev_apis/crypto/test_c039/source.mk
copy to api-tests/dev_apis/crypto/test_c037/test.cmake
index 710a57c..0a6a24b 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c038/test.cmake
similarity index 82%
copy from api-tests/dev_apis/crypto/test_c039/source.mk
copy to api-tests/dev_apis/crypto/test_c038/test.cmake
index 710a57c..59a6c5e 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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/test.cmake
similarity index 82%
copy from api-tests/dev_apis/crypto/test_c039/source.mk
copy to api-tests/dev_apis/crypto/test_c039/test.cmake
index 710a57c..3ed4781 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c040/test.cmake
similarity index 82%
copy from api-tests/dev_apis/crypto/test_c039/source.mk
copy to api-tests/dev_apis/crypto/test_c040/test.cmake
index 710a57c..3d33945 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c041/test.cmake
similarity index 82%
copy from api-tests/dev_apis/crypto/test_c039/source.mk
copy to api-tests/dev_apis/crypto/test_c041/test.cmake
index 710a57c..0e96d93 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c042/test.cmake
similarity index 82%
copy from api-tests/dev_apis/crypto/test_c039/source.mk
copy to api-tests/dev_apis/crypto/test_c042/test.cmake
index 710a57c..f67e12f 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c043/test.cmake
similarity index 82%
copy from api-tests/dev_apis/crypto/test_c039/source.mk
copy to api-tests/dev_apis/crypto/test_c043/test.cmake
index 710a57c..42e185d 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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/crypto/test_c039/source.mk b/api-tests/dev_apis/crypto/test_c044/test.cmake
similarity index 82%
copy from api-tests/dev_apis/crypto/test_c039/source.mk
copy to api-tests/dev_apis/crypto/test_c044/test.cmake
index 710a57c..0ceea82 100644
--- a/api-tests/dev_apis/crypto/test_c039/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_c039.c test_c039.c
-CC_OPTIONS =
-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 )