Adding CMake build support.
diff --git a/api-tests/ff/ipc/suite.cmake b/api-tests/ff/ipc/suite.cmake
new file mode 100644
index 0000000..aaaa0f2
--- /dev/null
+++ b/api-tests/ff/ipc/suite.cmake
@@ -0,0 +1,68 @@
+#/** @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()
+ foreach(source_file ${CC_SOURCE_SPE})
+ list(APPEND SUITE_CC_SOURCE_SPE
+ ${PSA_SUITE_DIR}/${test}/${source_file}
+ )
+ endforeach()
+ foreach(asm_file ${AS_SOURCE_SPE})
+ list(APPEND SUITE_AS_SOURCE_SPE
+ ${PSA_SUITE_DIR}/${test}/${asm_file}
+ )
+ endforeach()
+ unset(CC_SOURCE)
+ unset(AS_SOURCE)
+ unset(CC_SOURCE_SPE)
+ unset(AS_SOURCE_SPE)
+endforeach()
+
+add_library(${PSA_TARGET_TEST_COMBINE_LIB} STATIC ${SUITE_CC_SOURCE} ${SUITE_AS_SOURCE})
+target_compile_definitions(${PSA_TARGET_TEST_COMBINE_LIB} PRIVATE CC_OPTIONS)
+target_compile_definitions(${PSA_TARGET_TEST_COMBINE_LIB} PRIVATE AS_OPTIONS)
+target_compile_definitions(${PSA_TARGET_TEST_COMBINE_LIB} PRIVATE NONSECURE_TEST_BUILD)
+
+# 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}/val/spe
+ ${PSA_ROOT_DIR}/platform/targets/${TARGET}/nspe/common
+ ${PSA_ROOT_DIR}/platform/targets/${TARGET}/nspe/crypto
+)
diff --git a/api-tests/ff/ipc/test_i001/source.mk b/api-tests/ff/ipc/test_i001/source.mk
deleted file mode 100644
index 3231434..0000000
--- a/api-tests/ff/ipc/test_i001/source.mk
+++ /dev/null
@@ -1,25 +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_i001.c test_i001.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i001.c test_supp_i001.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i001/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i001/test.cmake
index 8f88250..698a8ff 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i001/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i001.c
+ test_i001.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i001.c
+ test_supp_i001.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i002/source.mk b/api-tests/ff/ipc/test_i002/source.mk
deleted file mode 100644
index 60cbe40..0000000
--- a/api-tests/ff/ipc/test_i002/source.mk
+++ /dev/null
@@ -1,25 +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_i002.c test_i002.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i002.c test_supp_i002.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i002/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i002/test.cmake
index 8f88250..33679bd 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i002/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i002.c
+ test_i002.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i002.c
+ test_supp_i002.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i003/source.mk b/api-tests/ff/ipc/test_i003/source.mk
deleted file mode 100644
index 37f7299..0000000
--- a/api-tests/ff/ipc/test_i003/source.mk
+++ /dev/null
@@ -1,25 +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_i003.c test_i003.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i003.c test_supp_i003.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i003/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i003/test.cmake
index 8f88250..aaa5d98 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i003/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i003.c
+ test_i003.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i003.c
+ test_supp_i003.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i004/source.mk b/api-tests/ff/ipc/test_i004/source.mk
deleted file mode 100644
index 2a23e73..0000000
--- a/api-tests/ff/ipc/test_i004/source.mk
+++ /dev/null
@@ -1,25 +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_i004.c test_i004.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i004.c test_supp_i004.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i004/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i004/test.cmake
index 8f88250..4ec996e 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i004/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i004.c
+ test_i004.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i004.c
+ test_supp_i004.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i005/source.mk b/api-tests/ff/ipc/test_i005/source.mk
deleted file mode 100644
index b139dbc..0000000
--- a/api-tests/ff/ipc/test_i005/source.mk
+++ /dev/null
@@ -1,25 +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_i005.c test_i005.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i005.c test_supp_i005.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i005/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i005/test.cmake
index 8f88250..68c51c5 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i005/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i005.c
+ test_i005.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i005.c
+ test_supp_i005.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i006/source.mk b/api-tests/ff/ipc/test_i006/source.mk
deleted file mode 100644
index f889299..0000000
--- a/api-tests/ff/ipc/test_i006/source.mk
+++ /dev/null
@@ -1,25 +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_i006.c test_i006.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i006.c test_supp_i006.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i006/test.cmake
similarity index 70%
rename from api-tests/ff/ipc/test_i080/source.mk
rename to api-tests/ff/ipc/test_i006/test.cmake
index 8f88250..96c034c 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i006/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i006.c
+ test_i006.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i006.c
+ test_supp_i006.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i007/source.mk b/api-tests/ff/ipc/test_i007/source.mk
deleted file mode 100644
index 10aebef..0000000
--- a/api-tests/ff/ipc/test_i007/source.mk
+++ /dev/null
@@ -1,25 +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_i007.c test_i007.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i007.c test_supp_i007.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i007/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i007/test.cmake
index 8f88250..f000d65 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i007/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i007.c
+ test_i007.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i007.c
+ test_supp_i007.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i008/source.mk b/api-tests/ff/ipc/test_i008/source.mk
deleted file mode 100644
index 383855d..0000000
--- a/api-tests/ff/ipc/test_i008/source.mk
+++ /dev/null
@@ -1,25 +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_i008.c test_i008.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i008.c test_supp_i008.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i008/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i008/test.cmake
index 8f88250..7ed1bf5 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i008/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i008.c
+ test_i008.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i008.c
+ test_supp_i008.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i009/source.mk b/api-tests/ff/ipc/test_i009/source.mk
deleted file mode 100644
index a4f3ef0..0000000
--- a/api-tests/ff/ipc/test_i009/source.mk
+++ /dev/null
@@ -1,25 +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_i009.c test_i009.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i009.c test_supp_i009.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i009/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i009/test.cmake
index 8f88250..bad159d 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i009/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i009.c
+ test_i009.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i009.c
+ test_supp_i009.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i010/source.mk b/api-tests/ff/ipc/test_i010/source.mk
deleted file mode 100644
index 02e1d3b..0000000
--- a/api-tests/ff/ipc/test_i010/source.mk
+++ /dev/null
@@ -1,25 +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_i010.c test_i010.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i010.c test_supp_i010.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i010/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i010/test.cmake
index 8f88250..6e57eba 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i010/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i010.c
+ test_i010.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i010.c
+ test_supp_i010.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i011/source.mk b/api-tests/ff/ipc/test_i011/source.mk
deleted file mode 100644
index 0e227a8..0000000
--- a/api-tests/ff/ipc/test_i011/source.mk
+++ /dev/null
@@ -1,25 +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_i011.c test_i011.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i011.c test_supp_i011.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i011/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i011/test.cmake
index 8f88250..338cce2 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i011/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i011.c
+ test_i011.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i011.c
+ test_supp_i011.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i012/source.mk b/api-tests/ff/ipc/test_i012/source.mk
deleted file mode 100644
index 49cb593..0000000
--- a/api-tests/ff/ipc/test_i012/source.mk
+++ /dev/null
@@ -1,25 +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_i012.c test_i012.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i012.c test_supp_i012.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i012/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i012/test.cmake
index 8f88250..299f8ee 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i012/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i012.c
+ test_i012.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i012.c
+ test_supp_i012.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i013/source.mk b/api-tests/ff/ipc/test_i013/source.mk
deleted file mode 100644
index 4a5dde5..0000000
--- a/api-tests/ff/ipc/test_i013/source.mk
+++ /dev/null
@@ -1,25 +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_i013.c test_i013.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i013.c test_supp_i013.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i013/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i013/test.cmake
index 8f88250..724efac 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i013/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i013.c
+ test_i013.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i013.c
+ test_supp_i013.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i014/source.mk b/api-tests/ff/ipc/test_i014/source.mk
deleted file mode 100644
index fb8fc6e..0000000
--- a/api-tests/ff/ipc/test_i014/source.mk
+++ /dev/null
@@ -1,25 +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_i014.c test_i014.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i014.c test_supp_i014.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i014/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i014/test.cmake
index 8f88250..aabe4e2 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i014/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i014.c
+ test_i014.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i014.c
+ test_supp_i014.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i015/source.mk b/api-tests/ff/ipc/test_i015/source.mk
deleted file mode 100644
index c55f830..0000000
--- a/api-tests/ff/ipc/test_i015/source.mk
+++ /dev/null
@@ -1,25 +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_i015.c test_i015.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i015.c test_supp_i015.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i015/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i015/test.cmake
index 8f88250..877f36b 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i015/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i015.c
+ test_i015.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i015.c
+ test_supp_i015.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i016/source.mk b/api-tests/ff/ipc/test_i016/source.mk
deleted file mode 100644
index d1d196f..0000000
--- a/api-tests/ff/ipc/test_i016/source.mk
+++ /dev/null
@@ -1,25 +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_i016.c test_i016.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i016.c test_supp_i016.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i016/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i016/test.cmake
index 8f88250..c4e90e4 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i016/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i016.c
+ test_i016.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i016.c
+ test_supp_i016.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i017/source.mk b/api-tests/ff/ipc/test_i017/source.mk
deleted file mode 100644
index 74458cc..0000000
--- a/api-tests/ff/ipc/test_i017/source.mk
+++ /dev/null
@@ -1,25 +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_i017.c test_i017.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i017.c test_supp_i017.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i017/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i017/test.cmake
index 8f88250..f8520cf 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i017/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i017.c
+ test_i017.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i017.c
+ test_supp_i017.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i018/source.mk b/api-tests/ff/ipc/test_i018/source.mk
deleted file mode 100644
index 51e7bec..0000000
--- a/api-tests/ff/ipc/test_i018/source.mk
+++ /dev/null
@@ -1,25 +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_i018.c test_i018.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i018.c test_supp_i018.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i018/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i018/test.cmake
index 8f88250..3e495dd 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i018/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i018.c
+ test_i018.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i018.c
+ test_supp_i018.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i019/source.mk b/api-tests/ff/ipc/test_i019/source.mk
deleted file mode 100644
index 483b29a..0000000
--- a/api-tests/ff/ipc/test_i019/source.mk
+++ /dev/null
@@ -1,25 +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_i019.c test_i019.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i019.c test_supp_i019.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i019/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i019/test.cmake
index 8f88250..3a3305f 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i019/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i019.c
+ test_i019.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i019.c
+ test_supp_i019.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i020/source.mk b/api-tests/ff/ipc/test_i020/source.mk
deleted file mode 100644
index 0d7c05e..0000000
--- a/api-tests/ff/ipc/test_i020/source.mk
+++ /dev/null
@@ -1,25 +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_i020.c test_i020.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i020.c test_supp_i020.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i020/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i020/test.cmake
index 8f88250..530cae1 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i020/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i020.c
+ test_i020.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i020.c
+ test_supp_i020.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i021/source.mk b/api-tests/ff/ipc/test_i021/source.mk
deleted file mode 100644
index 2cf268d..0000000
--- a/api-tests/ff/ipc/test_i021/source.mk
+++ /dev/null
@@ -1,25 +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_i021.c test_i021.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i021.c test_supp_i021.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i021/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i021/test.cmake
index 8f88250..d9ecfed 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i021/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i021.c
+ test_i021.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i021.c
+ test_supp_i021.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i022/source.mk b/api-tests/ff/ipc/test_i022/source.mk
deleted file mode 100644
index 0afb1b9..0000000
--- a/api-tests/ff/ipc/test_i022/source.mk
+++ /dev/null
@@ -1,25 +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_i022.c test_i022.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i022.c test_supp_i022.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i022/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i022/test.cmake
index 8f88250..915cddd 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i022/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i022.c
+ test_i022.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i022.c
+ test_supp_i022.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i023/source.mk b/api-tests/ff/ipc/test_i023/source.mk
deleted file mode 100644
index 516deb1..0000000
--- a/api-tests/ff/ipc/test_i023/source.mk
+++ /dev/null
@@ -1,25 +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_i023.c test_i023.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i023.c test_supp_i023.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i023/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i023/test.cmake
index 8f88250..176cfc8 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i023/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i023.c
+ test_i023.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i023.c
+ test_supp_i023.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i024/source.mk b/api-tests/ff/ipc/test_i024/source.mk
deleted file mode 100644
index 1213b26..0000000
--- a/api-tests/ff/ipc/test_i024/source.mk
+++ /dev/null
@@ -1,25 +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_i024.c test_i024.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i024.c test_supp_i024.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i024/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i024/test.cmake
index 8f88250..f0e0297 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i024/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i024.c
+ test_i024.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i024.c
+ test_supp_i024.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i025/source.mk b/api-tests/ff/ipc/test_i025/source.mk
deleted file mode 100644
index e4b6673..0000000
--- a/api-tests/ff/ipc/test_i025/source.mk
+++ /dev/null
@@ -1,25 +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_i025.c test_i025.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i025.c test_supp_i025.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i025/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i025/test.cmake
index 8f88250..e861a9a 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i025/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i025.c
+ test_i025.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i025.c
+ test_supp_i025.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i026/source.mk b/api-tests/ff/ipc/test_i026/source.mk
deleted file mode 100644
index b325585..0000000
--- a/api-tests/ff/ipc/test_i026/source.mk
+++ /dev/null
@@ -1,25 +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_i026.c test_i026.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i026.c test_supp_i026.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i026/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i026/test.cmake
index 8f88250..361dfbd 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i026/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i026.c
+ test_i026.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i026.c
+ test_supp_i026.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i027/source.mk b/api-tests/ff/ipc/test_i027/source.mk
deleted file mode 100644
index 7094e76..0000000
--- a/api-tests/ff/ipc/test_i027/source.mk
+++ /dev/null
@@ -1,25 +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_i027.c test_i027.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i027.c test_supp_i027.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i027/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i027/test.cmake
index 8f88250..27babcf 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i027/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i027.c
+ test_i027.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i027.c
+ test_supp_i027.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i028/source.mk b/api-tests/ff/ipc/test_i028/source.mk
deleted file mode 100644
index 4cfdd10..0000000
--- a/api-tests/ff/ipc/test_i028/source.mk
+++ /dev/null
@@ -1,25 +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_i028.c test_i028.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i028.c test_supp_i028.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i028/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i028/test.cmake
index 8f88250..189e407 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i028/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i028.c
+ test_i028.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i028.c
+ test_supp_i028.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i029/source.mk b/api-tests/ff/ipc/test_i029/source.mk
deleted file mode 100644
index 0d91668..0000000
--- a/api-tests/ff/ipc/test_i029/source.mk
+++ /dev/null
@@ -1,25 +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_i029.c test_i029.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i029.c test_supp_i029.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i029/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i029/test.cmake
index 8f88250..b083caa 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i029/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i029.c
+ test_i029.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i029.c
+ test_supp_i029.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i030/source.mk b/api-tests/ff/ipc/test_i030/source.mk
deleted file mode 100644
index 23d38ed..0000000
--- a/api-tests/ff/ipc/test_i030/source.mk
+++ /dev/null
@@ -1,25 +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_i030.c test_i030.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i030.c test_supp_i030.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i030/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i030/test.cmake
index 8f88250..877ec83 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i030/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i030.c
+ test_i030.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i030.c
+ test_supp_i030.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i031/source.mk b/api-tests/ff/ipc/test_i031/source.mk
deleted file mode 100644
index 415a8fc..0000000
--- a/api-tests/ff/ipc/test_i031/source.mk
+++ /dev/null
@@ -1,25 +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_i031.c test_i031.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i031.c test_supp_i031.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i031/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i031/test.cmake
index 8f88250..a9bbd09 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i031/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i031.c
+ test_i031.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i031.c
+ test_supp_i031.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i032/source.mk b/api-tests/ff/ipc/test_i032/source.mk
deleted file mode 100644
index 0806e3a..0000000
--- a/api-tests/ff/ipc/test_i032/source.mk
+++ /dev/null
@@ -1,25 +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_i032.c test_i032.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i032.c test_supp_i032.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i032/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i032/test.cmake
index 8f88250..413d839 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i032/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i032.c
+ test_i032.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i032.c
+ test_supp_i032.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i033/source.mk b/api-tests/ff/ipc/test_i033/source.mk
deleted file mode 100644
index 350d245..0000000
--- a/api-tests/ff/ipc/test_i033/source.mk
+++ /dev/null
@@ -1,25 +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_i033.c test_i033.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i033.c test_supp_i033.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i033/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i033/test.cmake
index 8f88250..75a6dd6 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i033/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i033.c
+ test_i033.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i033.c
+ test_supp_i033.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i034/source.mk b/api-tests/ff/ipc/test_i034/source.mk
deleted file mode 100644
index 108a4dc..0000000
--- a/api-tests/ff/ipc/test_i034/source.mk
+++ /dev/null
@@ -1,25 +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_i034.c test_i034.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i034.c test_supp_i034.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i034/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i034/test.cmake
index 8f88250..87f1491 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i034/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i034.c
+ test_i034.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i034.c
+ test_supp_i034.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i035/source.mk b/api-tests/ff/ipc/test_i035/source.mk
deleted file mode 100644
index 68ca342..0000000
--- a/api-tests/ff/ipc/test_i035/source.mk
+++ /dev/null
@@ -1,25 +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_i035.c test_i035.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i035.c test_supp_i035.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i035/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i035/test.cmake
index 8f88250..571d48a 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i035/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i035.c
+ test_i035.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i035.c
+ test_supp_i035.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i036/source.mk b/api-tests/ff/ipc/test_i036/source.mk
deleted file mode 100644
index ed3dc57..0000000
--- a/api-tests/ff/ipc/test_i036/source.mk
+++ /dev/null
@@ -1,25 +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_i036.c test_i036.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i036.c test_supp_i036.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i036/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i036/test.cmake
index 8f88250..4d89727 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i036/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i036.c
+ test_i036.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i036.c
+ test_supp_i036.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i037/source.mk b/api-tests/ff/ipc/test_i037/source.mk
deleted file mode 100644
index cfcf6e4..0000000
--- a/api-tests/ff/ipc/test_i037/source.mk
+++ /dev/null
@@ -1,25 +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_i037.c test_i037.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i037.c test_supp_i037.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i037/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i037/test.cmake
index 8f88250..2e64af5 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i037/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i037.c
+ test_i037.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i037.c
+ test_supp_i037.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i038/source.mk b/api-tests/ff/ipc/test_i038/source.mk
deleted file mode 100644
index 0553d67..0000000
--- a/api-tests/ff/ipc/test_i038/source.mk
+++ /dev/null
@@ -1,25 +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_i038.c test_i038.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i038.c test_supp_i038.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i038/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i038/test.cmake
index 8f88250..b0d7a96 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i038/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i038.c
+ test_i038.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i038.c
+ test_supp_i038.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i039/source.mk b/api-tests/ff/ipc/test_i039/source.mk
deleted file mode 100644
index 0c2d68e..0000000
--- a/api-tests/ff/ipc/test_i039/source.mk
+++ /dev/null
@@ -1,25 +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_i039.c test_i039.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i039.c test_supp_i039.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i039/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i039/test.cmake
index 8f88250..616c732 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i039/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i039.c
+ test_i039.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i039.c
+ test_supp_i039.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i040/source.mk b/api-tests/ff/ipc/test_i040/source.mk
deleted file mode 100644
index ba62c46..0000000
--- a/api-tests/ff/ipc/test_i040/source.mk
+++ /dev/null
@@ -1,25 +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_i040.c test_i040.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i040.c test_supp_i040.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i040/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i040/test.cmake
index 8f88250..336af6f 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i040/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i040.c
+ test_i040.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i040.c
+ test_supp_i040.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i041/source.mk b/api-tests/ff/ipc/test_i041/source.mk
deleted file mode 100644
index 40028a7..0000000
--- a/api-tests/ff/ipc/test_i041/source.mk
+++ /dev/null
@@ -1,25 +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_i041.c test_i041.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i041.c test_supp_i041.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i041/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i041/test.cmake
index 8f88250..e501752 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i041/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i041.c
+ test_i041.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i041.c
+ test_supp_i041.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i042/source.mk b/api-tests/ff/ipc/test_i042/source.mk
deleted file mode 100644
index a5f0f2e..0000000
--- a/api-tests/ff/ipc/test_i042/source.mk
+++ /dev/null
@@ -1,25 +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_i042.c test_i042.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i042.c test_supp_i042.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i042/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i042/test.cmake
index 8f88250..5f01de2 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i042/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i042.c
+ test_i042.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i042.c
+ test_supp_i042.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i043/source.mk b/api-tests/ff/ipc/test_i043/source.mk
deleted file mode 100644
index c7f19e5..0000000
--- a/api-tests/ff/ipc/test_i043/source.mk
+++ /dev/null
@@ -1,25 +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_i043.c test_i043.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i043.c test_supp_i043.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i043/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i043/test.cmake
index 8f88250..5dfeb41 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i043/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i043.c
+ test_i043.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i043.c
+ test_supp_i043.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i044/source.mk b/api-tests/ff/ipc/test_i044/source.mk
deleted file mode 100644
index 73fb620..0000000
--- a/api-tests/ff/ipc/test_i044/source.mk
+++ /dev/null
@@ -1,25 +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_i044.c test_i044.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i044.c test_supp_i044.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i044/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i044/test.cmake
index 8f88250..f7486d7 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i044/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i044.c
+ test_i044.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i044.c
+ test_supp_i044.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i045/source.mk b/api-tests/ff/ipc/test_i045/source.mk
deleted file mode 100644
index 602e53e..0000000
--- a/api-tests/ff/ipc/test_i045/source.mk
+++ /dev/null
@@ -1,25 +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_i045.c test_i045.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i045.c test_supp_i045.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i045/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i045/test.cmake
index 8f88250..c7fd5ba 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i045/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i045.c
+ test_i045.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i045.c
+ test_supp_i045.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i046/source.mk b/api-tests/ff/ipc/test_i046/source.mk
deleted file mode 100644
index 257c177..0000000
--- a/api-tests/ff/ipc/test_i046/source.mk
+++ /dev/null
@@ -1,25 +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_i046.c test_i046.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i046.c test_supp_i046.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i046/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i046/test.cmake
index 8f88250..c91735f 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i046/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i046.c
+ test_i046.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i046.c
+ test_supp_i046.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i047/source.mk b/api-tests/ff/ipc/test_i047/source.mk
deleted file mode 100644
index 5bb5a69..0000000
--- a/api-tests/ff/ipc/test_i047/source.mk
+++ /dev/null
@@ -1,25 +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_i047.c test_i047.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i047.c test_supp_i047.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i047/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i047/test.cmake
index 8f88250..72be9a4 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i047/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i047.c
+ test_i047.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i047.c
+ test_supp_i047.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i048/source.mk b/api-tests/ff/ipc/test_i048/source.mk
deleted file mode 100644
index 0c8e3a5..0000000
--- a/api-tests/ff/ipc/test_i048/source.mk
+++ /dev/null
@@ -1,25 +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_i048.c test_i048.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i048.c test_supp_i048.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i048/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i048/test.cmake
index 8f88250..a7f11bd 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i048/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i048.c
+ test_i048.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i048.c
+ test_supp_i048.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i049/source.mk b/api-tests/ff/ipc/test_i049/source.mk
deleted file mode 100644
index 9e3d969..0000000
--- a/api-tests/ff/ipc/test_i049/source.mk
+++ /dev/null
@@ -1,25 +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_i049.c test_i049.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i049.c test_supp_i049.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i049/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i049/test.cmake
index 8f88250..de1b322 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i049/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i049.c
+ test_i049.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i049.c
+ test_supp_i049.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i050/source.mk b/api-tests/ff/ipc/test_i050/source.mk
deleted file mode 100644
index de52ee3..0000000
--- a/api-tests/ff/ipc/test_i050/source.mk
+++ /dev/null
@@ -1,25 +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_i050.c test_i050.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i050.c test_supp_i050.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i050/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i050/test.cmake
index 8f88250..b70d3ea 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i050/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i050.c
+ test_i050.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i050.c
+ test_supp_i050.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i051/source.mk b/api-tests/ff/ipc/test_i051/source.mk
deleted file mode 100644
index 5ea476c..0000000
--- a/api-tests/ff/ipc/test_i051/source.mk
+++ /dev/null
@@ -1,25 +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_i051.c test_i051.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i051.c test_supp_i051.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i051/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i051/test.cmake
index 8f88250..ac938a9 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i051/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i051.c
+ test_i051.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i051.c
+ test_supp_i051.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i052/source.mk b/api-tests/ff/ipc/test_i052/source.mk
deleted file mode 100644
index e1aaf82..0000000
--- a/api-tests/ff/ipc/test_i052/source.mk
+++ /dev/null
@@ -1,25 +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_i052.c test_i052.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i052.c test_supp_i052.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i052/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i052/test.cmake
index 8f88250..c5524a2 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i052/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i052.c
+ test_i052.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i052.c
+ test_supp_i052.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i053/source.mk b/api-tests/ff/ipc/test_i053/source.mk
deleted file mode 100644
index 07e6f54..0000000
--- a/api-tests/ff/ipc/test_i053/source.mk
+++ /dev/null
@@ -1,25 +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_i053.c test_i053.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i053.c test_supp_i053.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i053/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i053/test.cmake
index 8f88250..a9be727 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i053/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i053.c
+ test_i053.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i053.c
+ test_supp_i053.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i054/source.mk b/api-tests/ff/ipc/test_i054/source.mk
deleted file mode 100644
index 8aae70f..0000000
--- a/api-tests/ff/ipc/test_i054/source.mk
+++ /dev/null
@@ -1,25 +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_i054.c test_i054.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i054.c test_supp_i054.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i054/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i054/test.cmake
index 8f88250..49495a6 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i054/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i054.c
+ test_i054.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i054.c
+ test_supp_i054.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i055/source.mk b/api-tests/ff/ipc/test_i055/source.mk
deleted file mode 100644
index 80a0263..0000000
--- a/api-tests/ff/ipc/test_i055/source.mk
+++ /dev/null
@@ -1,25 +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_i055.c test_i055.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i055.c test_supp_i055.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i055/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i055/test.cmake
index 8f88250..dfe9de8 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i055/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i055.c
+ test_i055.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i055.c
+ test_supp_i055.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i056/source.mk b/api-tests/ff/ipc/test_i056/source.mk
deleted file mode 100644
index 108c471..0000000
--- a/api-tests/ff/ipc/test_i056/source.mk
+++ /dev/null
@@ -1,25 +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_i056.c test_i056.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i056.c test_supp_i056.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i056/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i056/test.cmake
index 8f88250..553070a 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i056/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i056.c
+ test_i056.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i056.c
+ test_supp_i056.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i057/source.mk b/api-tests/ff/ipc/test_i057/source.mk
deleted file mode 100644
index 25fbaa9..0000000
--- a/api-tests/ff/ipc/test_i057/source.mk
+++ /dev/null
@@ -1,25 +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_i057.c test_i057.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i057.c test_supp_i057.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i057/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i057/test.cmake
index 8f88250..97e5bef 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i057/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i057.c
+ test_i057.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i057.c
+ test_supp_i057.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i058/source.mk b/api-tests/ff/ipc/test_i058/source.mk
deleted file mode 100644
index e4adfa9..0000000
--- a/api-tests/ff/ipc/test_i058/source.mk
+++ /dev/null
@@ -1,25 +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_i058.c test_i058.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i058.c test_supp_i058.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i058/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i058/test.cmake
index 8f88250..19a8f18 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i058/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i058.c
+ test_i058.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i058.c
+ test_supp_i058.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i059/source.mk b/api-tests/ff/ipc/test_i059/source.mk
deleted file mode 100644
index b72db0b..0000000
--- a/api-tests/ff/ipc/test_i059/source.mk
+++ /dev/null
@@ -1,25 +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_i059.c test_i059.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i059.c test_supp_i059.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i059/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i059/test.cmake
index 8f88250..92c44e5 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i059/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i059.c
+ test_i059.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i059.c
+ test_supp_i059.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i060/source.mk b/api-tests/ff/ipc/test_i060/source.mk
deleted file mode 100644
index 5f4d02d..0000000
--- a/api-tests/ff/ipc/test_i060/source.mk
+++ /dev/null
@@ -1,25 +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_i060.c test_i060.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i060.c test_supp_i060.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i060/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i060/test.cmake
index 8f88250..aa6cdd5 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i060/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i060.c
+ test_i060.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i060.c
+ test_supp_i060.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i061/source.mk b/api-tests/ff/ipc/test_i061/source.mk
deleted file mode 100644
index dc4d913..0000000
--- a/api-tests/ff/ipc/test_i061/source.mk
+++ /dev/null
@@ -1,25 +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_i061.c test_i061.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i061.c test_supp_i061.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i061/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i061/test.cmake
index 8f88250..23f79e3 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i061/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i061.c
+ test_i061.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i061.c
+ test_supp_i061.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i062/source.mk b/api-tests/ff/ipc/test_i062/source.mk
deleted file mode 100644
index b14d3c3..0000000
--- a/api-tests/ff/ipc/test_i062/source.mk
+++ /dev/null
@@ -1,25 +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_i062.c test_i062.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i062.c test_supp_i062.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i062/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i062/test.cmake
index 8f88250..b0ae70a 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i062/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i062.c
+ test_i062.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i062.c
+ test_supp_i062.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i063/source.mk b/api-tests/ff/ipc/test_i063/source.mk
deleted file mode 100644
index b23ec71..0000000
--- a/api-tests/ff/ipc/test_i063/source.mk
+++ /dev/null
@@ -1,25 +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_i063.c test_i063.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i063.c test_supp_i063.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i063/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i063/test.cmake
index 8f88250..bdbf6e8 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i063/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i063.c
+ test_i063.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i063.c
+ test_supp_i063.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i064/source.mk b/api-tests/ff/ipc/test_i064/source.mk
deleted file mode 100644
index 1796e27..0000000
--- a/api-tests/ff/ipc/test_i064/source.mk
+++ /dev/null
@@ -1,25 +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_i064.c test_i064.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i064.c test_supp_i064.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i064/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i064/test.cmake
index 8f88250..4e2a227 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i064/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i064.c
+ test_i064.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i064.c
+ test_supp_i064.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i065/source.mk b/api-tests/ff/ipc/test_i065/source.mk
deleted file mode 100644
index 9f62283..0000000
--- a/api-tests/ff/ipc/test_i065/source.mk
+++ /dev/null
@@ -1,25 +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_i065.c test_i065.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i065.c test_supp_i065.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i065/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i065/test.cmake
index 8f88250..567b71f 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i065/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i065.c
+ test_i065.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i065.c
+ test_supp_i065.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i066/source.mk b/api-tests/ff/ipc/test_i066/source.mk
deleted file mode 100644
index 604c13c..0000000
--- a/api-tests/ff/ipc/test_i066/source.mk
+++ /dev/null
@@ -1,25 +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_i066.c test_i066.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i066.c test_supp_i066.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i066/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i066/test.cmake
index 8f88250..5de4965 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i066/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i066.c
+ test_i066.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i066.c
+ test_supp_i066.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i067/source.mk b/api-tests/ff/ipc/test_i067/source.mk
deleted file mode 100644
index cce0b53..0000000
--- a/api-tests/ff/ipc/test_i067/source.mk
+++ /dev/null
@@ -1,25 +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_i067.c test_i067.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i067.c test_supp_i067.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i067/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i067/test.cmake
index 8f88250..66fabc8 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i067/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i067.c
+ test_i067.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i067.c
+ test_supp_i067.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i067/test_i067.c b/api-tests/ff/ipc/test_i067/test_i067.c
index 6e6f27f..f1f2228 100644
--- a/api-tests/ff/ipc/test_i067/test_i067.c
+++ b/api-tests/ff/ipc/test_i067/test_i067.c
@@ -19,13 +19,13 @@
#include "val_interfaces.h"
#include "val_target.h"
#else
-#include "val/common/val_client_defs.h"
-#include "val/spe/val_partition_common.h"
+#include "val_client_defs.h"
+#include "val_service_defs.h"
#endif
#include "test_i067.h"
-#if (SP_HEAP_MEM_SUPP == 1)
+#ifdef SP_HEAP_MEM_SUPP
void *malloc(size_t size);
void free(void *ptr);
#endif
@@ -39,7 +39,7 @@
int32_t client_test_dynamic_mem_alloc_fn(security_t caller)
{
/* Check heap memory support available to secure partition */
-#if (SP_HEAP_MEM_SUPP == 1)
+#ifdef SP_HEAP_MEM_SUPP
uint8_t *buffer;
val->print(PRINT_TEST, "[Check 1] Test dynamic memory allocation\n", 0);
diff --git a/api-tests/ff/ipc/test_i067/test_supp_i067.c b/api-tests/ff/ipc/test_i067/test_supp_i067.c
index b6d0779..aa5a8bf 100644
--- a/api-tests/ff/ipc/test_i067/test_supp_i067.c
+++ b/api-tests/ff/ipc/test_i067/test_supp_i067.c
@@ -25,7 +25,7 @@
#define SERVER_HEAP_SIZE 0x100 /* The size is same as heap_size field in manifest */
-#if (SP_HEAP_MEM_SUPP == 1)
+#ifdef SP_HEAP_MEM_SUPP
void *malloc(size_t size);
void free(void *ptr);
void *realloc(void *ptr, size_t size);
@@ -42,7 +42,7 @@
int32_t server_test_dynamic_mem_alloc_fn(void)
{
/* Perform checks only if heap memory support available to secure partition */
-#if (SP_HEAP_MEM_SUPP == 1)
+#ifdef SP_HEAP_MEM_SUPP
uint8_t *buffer, *buffer1;
uint8_t cmpbuff[SERVER_HEAP_SIZE] = {0};
diff --git a/api-tests/ff/ipc/test_i068/source.mk b/api-tests/ff/ipc/test_i068/source.mk
deleted file mode 100644
index e85e11e..0000000
--- a/api-tests/ff/ipc/test_i068/source.mk
+++ /dev/null
@@ -1,25 +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_i068.c test_i068.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i068.c test_supp_i068.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i068/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i068/test.cmake
index 8f88250..cefebf1 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i068/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i068.c
+ test_i068.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i068.c
+ test_supp_i068.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i068/test_i068.c b/api-tests/ff/ipc/test_i068/test_i068.c
index 0ab92dc..18b3c87 100644
--- a/api-tests/ff/ipc/test_i068/test_i068.c
+++ b/api-tests/ff/ipc/test_i068/test_i068.c
@@ -19,8 +19,8 @@
#include "val_interfaces.h"
#include "val_target.h"
#else
-#include "val/common/val_client_defs.h"
-#include "val/spe/val_partition_common.h"
+#include "val_client_defs.h"
+#include "val_service_defs.h"
#endif
#include "test_i068.h"
diff --git a/api-tests/ff/ipc/test_i069/source.mk b/api-tests/ff/ipc/test_i069/source.mk
deleted file mode 100644
index 9bedeb2..0000000
--- a/api-tests/ff/ipc/test_i069/source.mk
+++ /dev/null
@@ -1,25 +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_i069.c test_i069.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i069.c test_supp_i069.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i069/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i069/test.cmake
index 8f88250..99eb821 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i069/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i069.c
+ test_i069.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i069.c
+ test_supp_i069.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i069/test_i069.c b/api-tests/ff/ipc/test_i069/test_i069.c
index 53afce3..1955b9d 100644
--- a/api-tests/ff/ipc/test_i069/test_i069.c
+++ b/api-tests/ff/ipc/test_i069/test_i069.c
@@ -19,8 +19,8 @@
#include "val_interfaces.h"
#include "val_target.h"
#else
-#include "val/common/val_client_defs.h"
-#include "val/spe/val_partition_common.h"
+#include "val_client_defs.h"
+#include "val_service_defs.h"
#endif
#include "test_i069.h"
diff --git a/api-tests/ff/ipc/test_i070/source.mk b/api-tests/ff/ipc/test_i070/source.mk
deleted file mode 100644
index 9197155..0000000
--- a/api-tests/ff/ipc/test_i070/source.mk
+++ /dev/null
@@ -1,25 +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_i070.c test_i070.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i070.c test_supp_i070.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
\ No newline at end of file
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i070/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i070/test.cmake
index 8f88250..82d9a91 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i070/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i070.c
+ test_i070.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i070.c
+ test_supp_i070.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i070/test_i070.c b/api-tests/ff/ipc/test_i070/test_i070.c
index 45c5dc9..c9d5ac1 100644
--- a/api-tests/ff/ipc/test_i070/test_i070.c
+++ b/api-tests/ff/ipc/test_i070/test_i070.c
@@ -19,8 +19,8 @@
#include "val_interfaces.h"
#include "val_target.h"
#else
-#include "val/common/val_client_defs.h"
-#include "val/spe/val_partition_common.h"
+#include "val_client_defs.h"
+#include "val_service_defs.h"
#endif
#include "test_i070.h"
diff --git a/api-tests/ff/ipc/test_i071/source.mk b/api-tests/ff/ipc/test_i071/source.mk
deleted file mode 100644
index 2eac129..0000000
--- a/api-tests/ff/ipc/test_i071/source.mk
+++ /dev/null
@@ -1,25 +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_i071.c test_i071.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i071.c test_supp_i071.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i071/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i071/test.cmake
index 8f88250..a39ec15 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i071/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i071.c
+ test_i071.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i071.c
+ test_supp_i071.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i071/test_i071.c b/api-tests/ff/ipc/test_i071/test_i071.c
index 1c56a02..3e7774d 100644
--- a/api-tests/ff/ipc/test_i071/test_i071.c
+++ b/api-tests/ff/ipc/test_i071/test_i071.c
@@ -19,8 +19,8 @@
#include "val_interfaces.h"
#include "val_target.h"
#else
-#include "val/common/val_client_defs.h"
-#include "val/spe/val_partition_common.h"
+#include "val_client_defs.h"
+#include "val_service_defs.h"
#endif
#include "test_i071.h"
diff --git a/api-tests/ff/ipc/test_i072/source.mk b/api-tests/ff/ipc/test_i072/source.mk
deleted file mode 100644
index cdccca5..0000000
--- a/api-tests/ff/ipc/test_i072/source.mk
+++ /dev/null
@@ -1,25 +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_i072.c test_i072.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i072.c test_supp_i072.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i072/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i072/test.cmake
index 8f88250..c5fb69e 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i072/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i072.c
+ test_i072.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i072.c
+ test_supp_i072.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i073/source.mk b/api-tests/ff/ipc/test_i073/source.mk
deleted file mode 100644
index d52216e..0000000
--- a/api-tests/ff/ipc/test_i073/source.mk
+++ /dev/null
@@ -1,25 +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_i073.c test_i073.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i073.c test_supp_i073.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i073/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i073/test.cmake
index 8f88250..8f3321c 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i073/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i073.c
+ test_i073.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i073.c
+ test_supp_i073.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i074/source.mk b/api-tests/ff/ipc/test_i074/source.mk
deleted file mode 100644
index df3f9bd..0000000
--- a/api-tests/ff/ipc/test_i074/source.mk
+++ /dev/null
@@ -1,25 +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_i074.c test_i074.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i074.c test_supp_i074.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i074/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i074/test.cmake
index 8f88250..ce162f8 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i074/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i074.c
+ test_i074.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i074.c
+ test_supp_i074.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i074/test_i074.c b/api-tests/ff/ipc/test_i074/test_i074.c
index 8c58ca9..bc89152 100644
--- a/api-tests/ff/ipc/test_i074/test_i074.c
+++ b/api-tests/ff/ipc/test_i074/test_i074.c
@@ -36,7 +36,7 @@
NULL,
};
-#if (SP_HEAP_MEM_SUPP == 1)
+#ifdef SP_HEAP_MEM_SUPP
static int32_t get_secure_partition_address(addr_t *addr)
{
psa_handle_t handle = 0;
diff --git a/api-tests/ff/ipc/test_i074/test_supp_i074.c b/api-tests/ff/ipc/test_i074/test_supp_i074.c
index cbc790e..ff79d34 100644
--- a/api-tests/ff/ipc/test_i074/test_supp_i074.c
+++ b/api-tests/ff/ipc/test_i074/test_supp_i074.c
@@ -26,7 +26,7 @@
int32_t server_test_nspe_read_app_rot_heap(void);
int32_t server_test_nspe_write_app_rot_heap(void);
-#if (SP_HEAP_MEM_SUPP == 1)
+#ifdef SP_HEAP_MEM_SUPP
void *malloc(size_t size);
void free(void *ptr);
#endif
@@ -41,7 +41,7 @@
NULL,
};
-#if (SP_HEAP_MEM_SUPP == 1)
+#ifdef SP_HEAP_MEM_SUPP
static int32_t send_secure_partition_address(uint8_t *heap)
{
int32_t status = VAL_STATUS_SUCCESS;
diff --git a/api-tests/ff/ipc/test_i075/source.mk b/api-tests/ff/ipc/test_i075/source.mk
deleted file mode 100644
index 55b3a76..0000000
--- a/api-tests/ff/ipc/test_i075/source.mk
+++ /dev/null
@@ -1,25 +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_i075.c test_i075.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i075.c test_supp_i075.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i075/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i075/test.cmake
index 8f88250..a7583cf 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i075/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i075.c
+ test_i075.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i075.c
+ test_supp_i075.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i076/source.mk b/api-tests/ff/ipc/test_i076/source.mk
deleted file mode 100644
index 31064b8..0000000
--- a/api-tests/ff/ipc/test_i076/source.mk
+++ /dev/null
@@ -1,25 +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_i076.c test_i076.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i076.c test_supp_i076.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i076/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i076/test.cmake
index 8f88250..6e1dd1b 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i076/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i076.c
+ test_i076.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i076.c
+ test_supp_i076.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i077/source.mk b/api-tests/ff/ipc/test_i077/source.mk
deleted file mode 100644
index b5026c3..0000000
--- a/api-tests/ff/ipc/test_i077/source.mk
+++ /dev/null
@@ -1,25 +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_i077.c test_i077.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i077.c test_supp_i077.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i077/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i077/test.cmake
index 8f88250..0a060bf 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i077/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i077.c
+ test_i077.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i077.c
+ test_supp_i077.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i078/source.mk b/api-tests/ff/ipc/test_i078/source.mk
deleted file mode 100644
index 7f8dbe7..0000000
--- a/api-tests/ff/ipc/test_i078/source.mk
+++ /dev/null
@@ -1,25 +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_i078.c test_i078.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i078.c test_supp_i078.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i078/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i078/test.cmake
index 8f88250..c7273d9 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i078/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i078.c
+ test_i078.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i078.c
+ test_supp_i078.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i078/test_i078.c b/api-tests/ff/ipc/test_i078/test_i078.c
index 338b781..d46365c 100644
--- a/api-tests/ff/ipc/test_i078/test_i078.c
+++ b/api-tests/ff/ipc/test_i078/test_i078.c
@@ -36,7 +36,7 @@
NULL,
};
-#if (SP_HEAP_MEM_SUPP == 1)
+#ifdef SP_HEAP_MEM_SUPP
static int32_t get_secure_partition_address(psa_handle_t *handle,
addr_t *addr,
driver_test_fn_id_t test_fn_id)
diff --git a/api-tests/ff/ipc/test_i079/source.mk b/api-tests/ff/ipc/test_i079/source.mk
deleted file mode 100644
index e1357c4..0000000
--- a/api-tests/ff/ipc/test_i079/source.mk
+++ /dev/null
@@ -1,25 +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_i079.c test_i079.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i079.c test_supp_i079.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i079/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i079/test.cmake
index 8f88250..2cab6b3 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i079/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i079.c
+ test_i079.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i079.c
+ test_supp_i079.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i080/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i080/test.cmake
index 8f88250..6495d40 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i080/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i080.c
+ test_i080.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i080.c
+ test_supp_i080.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i081/source.mk b/api-tests/ff/ipc/test_i081/source.mk
deleted file mode 100644
index 3344b9e..0000000
--- a/api-tests/ff/ipc/test_i081/source.mk
+++ /dev/null
@@ -1,25 +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_i081.c test_i081.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i081.c test_supp_i081.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i081/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i081/test.cmake
index 8f88250..da099b7 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i081/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i081.c
+ test_i081.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i081.c
+ test_supp_i081.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i082/source.mk b/api-tests/ff/ipc/test_i082/source.mk
deleted file mode 100644
index 7b568ce..0000000
--- a/api-tests/ff/ipc/test_i082/source.mk
+++ /dev/null
@@ -1,25 +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_i082.c test_i082.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i082.c test_supp_i082.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i082/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i082/test.cmake
index 8f88250..e0c7581 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i082/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i082.c
+ test_i082.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i082.c
+ test_supp_i082.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i082/test_i082.c b/api-tests/ff/ipc/test_i082/test_i082.c
index 6ddd6a7..05e3f84 100644
--- a/api-tests/ff/ipc/test_i082/test_i082.c
+++ b/api-tests/ff/ipc/test_i082/test_i082.c
@@ -36,7 +36,7 @@
NULL,
};
-#if (SP_HEAP_MEM_SUPP == 1)
+#ifdef SP_HEAP_MEM_SUPP
static int32_t get_secure_partition_address(psa_handle_t *handle,
addr_t *addr,
driver_test_fn_id_t test_fn_id)
diff --git a/api-tests/ff/ipc/test_i083/source.mk b/api-tests/ff/ipc/test_i083/source.mk
deleted file mode 100644
index a13ab84..0000000
--- a/api-tests/ff/ipc/test_i083/source.mk
+++ /dev/null
@@ -1,25 +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_i083.c test_i083.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i083.c test_supp_i083.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i083/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i083/test.cmake
index 8f88250..74e5fbe 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i083/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i083.c
+ test_i083.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i083.c
+ test_supp_i083.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i084/source.mk b/api-tests/ff/ipc/test_i084/source.mk
deleted file mode 100644
index 428c065..0000000
--- a/api-tests/ff/ipc/test_i084/source.mk
+++ /dev/null
@@ -1,25 +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_i084.c test_i084.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i084.c test_supp_i084.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i084/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i084/test.cmake
index 8f88250..f6e9040 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i084/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i084.c
+ test_i084.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i084.c
+ test_supp_i084.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i085/source.mk b/api-tests/ff/ipc/test_i085/source.mk
deleted file mode 100644
index 2a8e13b..0000000
--- a/api-tests/ff/ipc/test_i085/source.mk
+++ /dev/null
@@ -1,25 +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_i085.c test_i085.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i085.c test_supp_i085.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i085/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i085/test.cmake
index 8f88250..cb4948f 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i085/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i085.c
+ test_i085.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i085.c
+ test_supp_i085.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i086/source.mk b/api-tests/ff/ipc/test_i086/source.mk
deleted file mode 100644
index d07ace1..0000000
--- a/api-tests/ff/ipc/test_i086/source.mk
+++ /dev/null
@@ -1,25 +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_i086.c test_i086.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i086.c test_supp_i086.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i086/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i086/test.cmake
index 8f88250..d8d5f40 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i086/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i086.c
+ test_i086.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i086.c
+ test_supp_i086.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_i086/test_i086.c b/api-tests/ff/ipc/test_i086/test_i086.c
index 7f56cbe..370e935 100644
--- a/api-tests/ff/ipc/test_i086/test_i086.c
+++ b/api-tests/ff/ipc/test_i086/test_i086.c
@@ -36,7 +36,7 @@
NULL,
};
-#if (SP_HEAP_MEM_SUPP == 1)
+#ifdef SP_HEAP_MEM_SUPP
static int32_t get_secure_partition_address(addr_t *addr)
{
psa_handle_t handle = 0;
diff --git a/api-tests/ff/ipc/test_i086/test_supp_i086.c b/api-tests/ff/ipc/test_i086/test_supp_i086.c
index 52fef11..946273e 100644
--- a/api-tests/ff/ipc/test_i086/test_supp_i086.c
+++ b/api-tests/ff/ipc/test_i086/test_supp_i086.c
@@ -26,7 +26,7 @@
int32_t server_test_sp_read_other_sp_heap(void);
int32_t server_test_sp_write_other_sp_heap(void);
-#if (SP_HEAP_MEM_SUPP == 1)
+#ifdef SP_HEAP_MEM_SUPP
void *malloc(size_t size);
void free(void *ptr);
#endif
@@ -41,7 +41,7 @@
NULL,
};
-#if (SP_HEAP_MEM_SUPP == 1)
+#ifdef SP_HEAP_MEM_SUPP
static int32_t send_secure_partition_address(uint8_t *heap)
{
int32_t status = VAL_STATUS_SUCCESS;
diff --git a/api-tests/ff/ipc/test_i087/source.mk b/api-tests/ff/ipc/test_i087/source.mk
deleted file mode 100644
index d0cfd53..0000000
--- a/api-tests/ff/ipc/test_i087/source.mk
+++ /dev/null
@@ -1,25 +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_i087.c test_i087.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_i087.c test_supp_i087.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_i087/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_i087/test.cmake
index 8f88250..4746ba6 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_i087/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_i087.c
+ test_i087.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_i087.c
+ test_supp_i087.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )
diff --git a/api-tests/ff/ipc/test_l088/source.mk b/api-tests/ff/ipc/test_l088/source.mk
deleted file mode 100644
index 69cfbcf..0000000
--- a/api-tests/ff/ipc/test_l088/source.mk
+++ /dev/null
@@ -1,25 +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_l088.c test_l088.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
-
-CC_SOURCE_SPE = test_l088.c test_supp_l088.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
diff --git a/api-tests/ff/ipc/test_i080/source.mk b/api-tests/ff/ipc/test_l088/test.cmake
similarity index 70%
copy from api-tests/ff/ipc/test_i080/source.mk
copy to api-tests/ff/ipc/test_l088/test.cmake
index 8f88250..16026f9 100644
--- a/api-tests/ff/ipc/test_i080/source.mk
+++ b/api-tests/ff/ipc/test_l088/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,12 +15,18 @@
# * limitations under the License.
#**/
-CC_SOURCE = test_entry_i080.c test_i080.c
-CC_OPTIONS =
-AS_SOURCE =
-AS_OPTIONS =
+list(APPEND CC_SOURCE
+ test_entry_l088.c
+ test_l088.c
+)
+list(APPEND CC_OPTIONS )
+list(APPEND AS_SOURCE )
+list(APPEND AS_OPTIONS )
-CC_SOURCE_SPE = test_i080.c test_supp_i080.c
-CC_OPTIONS_SPE =
-AS_SOURCE_SPE =
-AS_OPTIONS_SPE =
+list(APPEND CC_SOURCE_SPE
+ test_l088.c
+ test_supp_l088.c
+)
+list(APPEND CC_OPTIONS_SPE )
+list(APPEND AS_SOURCE_SPE )
+list(APPEND AS_OPTIONS_SPE )