fix(tftf): disable RMI tests when building for aarch32 architecture
Signed-off-by: Javier Almansa Sobrino <javier.almansasobrino@arm.com>
Change-Id: I6fa83808f7101de50141c89c044425ea355c8f6d
diff --git a/tftf/tests/aarch32_tests_to_skip.txt b/tftf/tests/aarch32_tests_to_skip.txt
index 9ccc1b5..e31202d 100644
--- a/tftf/tests/aarch32_tests_to_skip.txt
+++ b/tftf/tests/aarch32_tests_to_skip.txt
@@ -5,3 +5,6 @@
#
Realm payload at EL1
SIMD,SVE Registers context
+Invalid memory access with RME extension
+RMI and SPM tests
+SP exceptions
\ No newline at end of file
diff --git a/tftf/tests/tests-invalid-access.mk b/tftf/tests/tests-invalid-access.mk
index 9cda78c..3b05349 100644
--- a/tftf/tests/tests-invalid-access.mk
+++ b/tftf/tests/tests-invalid-access.mk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2022, Arm Limited. All rights reserved.
+# Copyright (c) 2023, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -9,12 +9,16 @@
TESTS_SOURCES += tftf/tests/misc_tests/test_invalid_access.c
+ifeq (${ARCH},aarch64)
+
TESTS_SOURCES += \
$(addprefix tftf/tests/runtime_services/host_realm_managment/, \
host_realm_rmi.c \
host_realm_helper.c \
)
+endif
+
TESTS_SOURCES += \
$(addprefix tftf/tests/runtime_services/secure_service/, \
${ARCH}/ffa_arch_helpers.S \
diff --git a/tftf/tests/tests-invalid-access.xml b/tftf/tests/tests-invalid-access.xml
index 17bb50a..0cd8234 100644
--- a/tftf/tests/tests-invalid-access.xml
+++ b/tftf/tests/tests-invalid-access.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright (c) 2022, Arm Limited. All rights reserved.
+ Copyright (c) 2023, Arm Limited. All rights reserved.
SPDX-License-Identifier: BSD-3-Clause
-->
@@ -10,10 +10,14 @@
<testsuite name="Invalid memory access" description="Invalid memory access">
<testcase name="Access EL3 memory from NS world"
function="el3_memory_cannot_be_accessed_in_ns" />
- <testcase name="Access Realm memory from NS world"
- function="rl_memory_cannot_be_accessed_in_ns" />
<testcase name="Access Secure memory from NS world"
function="s_memory_cannot_be_accessed_in_ns" />
+ </testsuite>
+
+ <testsuite name="Invalid memory access with RME extension"
+ description="Invalid memory access with RME extension">
+ <testcase name="Access Realm memory from NS world"
+ function="rl_memory_cannot_be_accessed_in_ns" />
<testcase name="Access Secure memory from Realm world"
function="s_memory_cannot_be_accessed_in_rl" />
<testcase name="Access Root memory from Realm world"
diff --git a/tftf/tests/tests-rmi-spm.mk b/tftf/tests/tests-rmi-spm.mk
index 289c077..12ebb5a 100644
--- a/tftf/tests/tests-rmi-spm.mk
+++ b/tftf/tests/tests-rmi-spm.mk
@@ -1,9 +1,11 @@
#
-# Copyright (c) 2021-2022, Arm Limited. All rights reserved.
+# Copyright (c) 2021-2023, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
+ifeq (${ARCH},aarch64)
+
TFTF_INCLUDES += \
-Iinclude/runtime_services/host_realm_managment
@@ -25,3 +27,4 @@
$(addprefix lib/heap/, \
page_alloc.c \
)
+endif