Merge "Separate shutdown and stats after shutdown tests"
diff --git a/tftf/tests/tests-manual-shutdown.mk b/tftf/tests/tests-manual-shutdown.mk
new file mode 100644
index 0000000..fed0a60
--- /dev/null
+++ b/tftf/tests/tests-manual-shutdown.mk
@@ -0,0 +1,19 @@
+#
+# Copyright (c) 2018, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+TESTS_SOURCES += \
+ $(addprefix tftf/tests/runtime_services/standard_service/psci/api_tests/, \
+ psci_stat/test_psci_stat.c \
+ system_off/test_system_off.c \
+ )
+
+ifeq (${USE_NVM},0)
+$(error Manual tests require USE_NVM=1 to persist test results across reboots)
+endif
+
+ifeq (${NEW_TEST_SESSION},1)
+$(error Manual tests require NEW_TEST_SESSION=0 to persist test results across reboots)
+endif
diff --git a/tftf/tests/tests-manual-shutdown.xml b/tftf/tests/tests-manual-shutdown.xml
new file mode 100644
index 0000000..912f646
--- /dev/null
+++ b/tftf/tests/tests-manual-shutdown.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ Copyright (c) 2018, Arm Limited. All rights reserved.
+
+ SPDX-License-Identifier: BSD-3-Clause
+-->
+
+<testsuites>
+
+
+ <testsuite name="PSCI STAT" description="Test PSCI STAT support System level">
+ <testcase name="for stats after system shutdown" function="test_psci_stats_after_shutdown" />
+ </testsuite>
+
+ <testsuite name="System off test" description="Validate SYSTEM_OFF PSCI call">
+ <testcase name="System Off" function="test_system_off" />
+ </testsuite>
+
+
+</testsuites>