TFTF: Isolate SPM Legacy tests

Move the SPM legacy tests based on MM_COMMUNICATE calls into their own
sub-directory. Take them out of the default tests manifest. To compile
a TFTF binary that includes these tests, one must now explicitly use
the SPM legacy test manifest:

> make TESTS_FILE=tests/tests-spm-legacy.xml

This paves the way to future patches that will add support for
different flavours of Cactus.

Change-Id: I4ac2b7d0ce772c005205fee1526ebe9a10e56a9b
Signed-off-by: Sandrine Bailleux <sandrine.bailleux@arm.com>

7 files changed, 10 insertions, 12 deletions

diff --git a/plat/arm/board/juno/tests.xml b/plat/arm/board/juno/tests.xml
index 8f77bd1..e4ef47e 100644
--- a/plat/arm/board/juno/tests.xml
+++ b/plat/arm/board/juno/tests.xml
@@ -16,7 +16,6 @@
 <!DOCTYPE testsuites [
   <!ENTITY tests-tftf-validation SYSTEM "../../../../tests/tests-tftf-validation.xml">
   <!ENTITY tests-psci SYSTEM "../../../../tests/tests-psci.xml">
-  <!ENTITY tests-spm SYSTEM "../../../../tests/tests-spm.xml">
   <!ENTITY tests-sdei SYSTEM "../../../../tests/tests-sdei.xml">
   <!ENTITY tests-rt-instr SYSTEM "../../../../tests/tests-runtime-instrumentation.xml">
   <!ENTITY tests-tsp SYSTEM "../../../../tests/tests-tsp.xml">
@@ -30,7 +29,6 @@
 
   &tests-tftf-validation;
   &tests-psci;
-  &tests-spm;
   &tests-sdei;
   &tests-rt-instr;
   &tests-tsp;
diff --git a/tests/runtime_services/secure_service/test_secure_service_handle.c b/tests/runtime_services/secure_service/legacy/test_secure_service_handle.c
index effa873..effa873 100644
--- a/tests/runtime_services/secure_service/test_secure_service_handle.c
+++ b/tests/runtime_services/secure_service/legacy/test_secure_service_handle.c
diff --git a/tests/runtime_services/secure_service/test_secure_service_interrupts.c b/tests/runtime_services/secure_service/legacy/test_secure_service_interrupts.c
index 549ca48..549ca48 100644
--- a/tests/runtime_services/secure_service/test_secure_service_interrupts.c
+++ b/tests/runtime_services/secure_service/legacy/test_secure_service_interrupts.c
diff --git a/tests/tests-common.xml b/tests/tests-common.xml
index b384c49..3996f00 100644
--- a/tests/tests-common.xml
+++ b/tests/tests-common.xml
@@ -11,7 +11,6 @@
 <!DOCTYPE testsuites [
   <!ENTITY tests-tftf-validation SYSTEM "tests-tftf-validation.xml">
   <!ENTITY tests-psci SYSTEM "tests-psci.xml">
-  <!ENTITY tests-spm SYSTEM "tests-spm.xml">
   <!ENTITY tests-sdei SYSTEM "tests-sdei.xml">
   <!ENTITY tests-rt-instr SYSTEM "tests-runtime-instrumentation.xml">
   <!ENTITY tests-tsp SYSTEM "tests-tsp.xml">
@@ -25,7 +24,6 @@
 
   &tests-tftf-validation;
   &tests-psci;
-  &tests-spm;
   &tests-sdei;
   &tests-rt-instr;
   &tests-tsp;
diff --git a/tests/tests-extensive.xml b/tests/tests-extensive.xml
index a214f54..1650d66 100644
--- a/tests/tests-extensive.xml
+++ b/tests/tests-extensive.xml
@@ -19,7 +19,6 @@
 
   <!ENTITY tests-tftf-validation SYSTEM "tests-tftf-validation.xml">
   <!ENTITY tests-psci SYSTEM "tests-psci.xml">
-  <!ENTITY tests-spm SYSTEM "tests-spm.xml">
   <!ENTITY tests-sdei SYSTEM "tests-sdei.xml">
   <!ENTITY tests-rt-instr SYSTEM "tests-runtime-instrumentation.xml">
   <!ENTITY tests-tsp SYSTEM "tests-tsp.xml">
@@ -35,7 +34,6 @@
 
   &tests-tftf-validation;
   &tests-psci;
-  &tests-spm;
   &tests-sdei;
   &tests-rt-instr;
   &tests-tsp;
diff --git a/tests/tests-spm.xml b/tests/tests-spm-legacy.xml
index 137d8b4..ed3fb7b 100644
--- a/tests/tests-spm.xml
+++ b/tests/tests-spm-legacy.xml
@@ -14,10 +14,14 @@
 
 <testsuites>
 
-  <testsuite name="SPM" description="SPM test framework">
-     <testcase name="SPM NS interrupts test" function="test_secure_partition_interrupt_by_ns" />
-     <testcase name="SPM secondary CPUs sequential test" function="test_secure_partition_secondary_cores_seq" />
-     <testcase name="SPM secondary CPUs simultaneous test" function="test_secure_partition_secondary_cores_sim" />
+  <testsuite name="SPM legacy"
+             description="Test SPM legacy APIs based on MM_COMMUNICATE calls">
+    <testcase name="SPM NS interrupts test"
+              function="test_secure_partition_interrupt_by_ns" />
+    <testcase name="SPM secondary CPUs sequential test"
+              function="test_secure_partition_secondary_cores_seq" />
+    <testcase name="SPM secondary CPUs simultaneous test"
+              function="test_secure_partition_secondary_cores_sim" />
   </testsuite>
 
 </testsuites>
diff --git a/tests/tests.mk b/tests/tests.mk
index ede5add..085fcad 100644
--- a/tests/tests.mk
+++ b/tests/tests.mk
@@ -11,8 +11,8 @@ TESTS_SOURCES	:=	tests/extensions/amu/test_amu.c					\
 			tests/framework_validation_tests/test_validation_nvm.c		\
 			tests/framework_validation_tests/test_validation_sgi.c		\
 			tests/performance_tests/smc_latencies.c				\
-			tests/runtime_services/secure_service/test_secure_service_handle.c \
-			tests/runtime_services/secure_service/test_secure_service_interrupts.c \
+			tests/runtime_services/secure_service/legacy/test_secure_service_handle.c \
+			tests/runtime_services/secure_service/legacy/test_secure_service_interrupts.c \
 			tests/runtime_services/secure_service/secure_service_helpers.c	\
 			tests/runtime_services/sip_service/test_exec_state_switch.c	\
 			tests/runtime_services/sip_service/test_exec_state_switch_asm.S \