Merge "Create new xml to split Juno reboot tests"
diff --git a/tftf/tests/tests-reboot.xml b/tftf/tests/tests-reboot.xml
index 2b06cb3..fa4da13 100644
--- a/tftf/tests/tests-reboot.xml
+++ b/tftf/tests/tests-reboot.xml
@@ -18,9 +18,7 @@
</testsuite>
<testsuite name="PSCI reset2" description="Check the reset2 feature">
- <testcase name="PSCI reset2 - warm reset" function="reset2_warm" />
<testcase name="PSCI reset2 - invalid reset options" function="reset2_test_invalid" />
- <testcase name="PSCI reset2 - warm reset and mem_protect" function="reset2_mem_protect" />
</testsuite>
</testsuites>
diff --git a/tftf/tests/tests-reboot_reset2.mk b/tftf/tests/tests-reboot_reset2.mk
new file mode 100644
index 0000000..b0f5738
--- /dev/null
+++ b/tftf/tests/tests-reboot_reset2.mk
@@ -0,0 +1,20 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+TESTS_SOURCES += \
+ $(addprefix tftf/tests/runtime_services/standard_service/psci/api_tests/, \
+ mem_protect/test_mem_protect.c \
+ psci_stat/test_psci_stat.c \
+ reset2/reset2.c \
+ )
+
+ifeq (${USE_NVM},0)
+$(error Reboot tests require USE_NVM=1 to persist test results across reboots)
+endif
+
+ifeq (${NEW_TEST_SESSION},1)
+$(error Reboot tests require NEW_TEST_SESSION=0 to persist test results across reboots)
+endif
diff --git a/tftf/tests/tests-reboot_reset2.xml b/tftf/tests/tests-reboot_reset2.xml
new file mode 100644
index 0000000..1735bc3
--- /dev/null
+++ b/tftf/tests/tests-reboot_reset2.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ Copyright (c) 2019, Arm Limited. All rights reserved.
+
+ SPDX-License-Identifier: BSD-3-Clause
+-->
+
+<testsuites>
+
+
+ <testsuite name="PSCI reset2" description="Check the reset2 feature">
+ <testcase name="PSCI reset2 - warm reset" function="reset2_warm" />
+ <testcase name="PSCI reset2 - warm reset and mem_protect" function="reset2_mem_protect" />
+ </testsuite>
+
+</testsuites>