refactor(smc): group all smc tests
Move and group all smccc related tests to tests-smc*
file.
Change-Id: I34eb4dc906b558badab2c9356bb316d92f40914a
Signed-off-by: Govindraj Raja <govindraj.raja@arm.com>
diff --git a/tftf/tests/tests-psci.mk b/tftf/tests/tests-psci.mk
index 0be0cef..597ee8c 100644
--- a/tftf/tests/tests-psci.mk
+++ b/tftf/tests/tests-psci.mk
@@ -1,15 +1,9 @@
#
-# Copyright (c) 2018, Arm Limited. All rights reserved.
+# Copyright (c) 2018-2024, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
-TESTS_SOURCES += \
- $(addprefix tftf/tests/runtime_services/standard_service/, \
- query_std_svc.c \
- unknown_smc.c \
- )
-
TESTS_SOURCES += \
$(addprefix tftf/tests/runtime_services/standard_service/psci/api_tests/, \
affinity_info/test_psci_affinity_info.c \
diff --git a/tftf/tests/tests-psci.xml b/tftf/tests/tests-psci.xml
index e9c612b..918d9a7 100644
--- a/tftf/tests/tests-psci.xml
+++ b/tftf/tests/tests-psci.xml
@@ -1,24 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright (c) 2018, Arm Limited. All rights reserved.
+ Copyright (c) 2018-2024, Arm Limited. All rights reserved.
SPDX-License-Identifier: BSD-3-Clause
-->
<testsuites>
- <!--
- Strictly speaking, this testsuite is not testing PSCI but we put it here
- nonetheless to avoid having it alone in a separate XML file.
- -->
- <testsuite name="Query runtime services" description="Generic queries as defined by the SMCCC">
- <testcase name="Unknown SMC" function="test_unknown_smc" />
- <testcase name="Query Standard Service" function="test_query_std_svc" />
- </testsuite>
-
<testsuite name="PSCI Version" description="Check the version of PSCI implemented">
- <testcase name="PSCI Version" function="test_psci_version" />
+ <testcase name="PSCI Version" function="test_psci_version" />
</testsuite>
<testsuite name="PSCI Affinity Info" description="Test PSCI AFFINITY_INFO support">
diff --git a/tftf/tests/tests-smc.mk b/tftf/tests/tests-smc.mk
index 8496cd1..c3058b2 100644
--- a/tftf/tests/tests-smc.mk
+++ b/tftf/tests/tests-smc.mk
@@ -1,7 +1,13 @@
#
-# Copyright (c) 2018, Arm Limited. All rights reserved.
+# Copyright (c) 2018-2024, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
-TESTS_SOURCES += tftf/tests/runtime_services/generic/generic_smc.c
+TESTS_SOURCES += \
+ $(addprefix tftf/tests/runtime_services/, \
+ generic/generic_smc.c \
+ standard_service/query_std_svc.c \
+ standard_service/unknown_smc.c \
+ )
+
diff --git a/tftf/tests/tests-smc.xml b/tftf/tests/tests-smc.xml
index 56f987d..3633118 100644
--- a/tftf/tests/tests-smc.xml
+++ b/tftf/tests/tests-smc.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright (c) 2018, Arm Limited. All rights reserved.
+ Copyright (c) 2018-2024, Arm Limited. All rights reserved.
SPDX-License-Identifier: BSD-3-Clause
-->
@@ -16,4 +16,9 @@
<testcase name="Yielding SMC64" function="smc64_yielding" />
</testsuite>
+ <testsuite name="Query runtime services" description="Generic queries as defined by the SMCCC">
+ <testcase name="Unknown SMC" function="test_unknown_smc" />
+ <testcase name="Query Standard Service" function="test_query_std_svc" />
+ </testsuite>
+
</testsuites>