aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Beesley <paul.beesley@arm.com>2019-08-16 15:27:53 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2019-08-16 15:27:53 +0000
commit2676b99a81b4f886b7b79189cbe432705843977b (patch)
tree9c16d690c69f9d9cdab479da158472dd7f688e21
parent4c213e5eb22269da1a92b53c01a91e8f36439a0e (diff)
parent89391603d63fd409c18e00e45c864dc9749f2f25 (diff)
downloadtf-a-tests-2676b99a81b4f886b7b79189cbe432705843977b.tar.gz
Merge "Create new xml to split Juno reboot tests"
-rw-r--r--tftf/tests/tests-reboot.xml2
-rw-r--r--tftf/tests/tests-reboot_reset2.mk20
-rw-r--r--tftf/tests/tests-reboot_reset2.xml17
3 files changed, 37 insertions, 2 deletions
diff --git a/tftf/tests/tests-reboot.xml b/tftf/tests/tests-reboot.xml
index 2b06cb3e1..fa4da1373 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 000000000..b0f573841
--- /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 000000000..1735bc334
--- /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>