test(realm): Use new build flag for Realm tests
Use new build flag ENABLE_REALM_PAYLOAD_TESTS=1
for realm payload tests.
Signed-off-by: Shruti Gupta <shruti.gupta@arm.com>
Change-Id: I83b0a069351210437def177370e7d4621b3aab03
diff --git a/group/spm-l2-boot-tests/fvp-default,fvp-spm-rme,fvp-default:fvp-spm.trp.tftf-tftf.rme b/group/spm-l2-boot-tests/fvp-default,fvp-spm-rme,fvp-rme:fvp-spm.trp.tftf-tftf.rme
similarity index 100%
rename from group/spm-l2-boot-tests/fvp-default,fvp-spm-rme,fvp-default:fvp-spm.trp.tftf-tftf.rme
rename to group/spm-l2-boot-tests/fvp-default,fvp-spm-rme,fvp-rme:fvp-spm.trp.tftf-tftf.rme
diff --git a/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-mb-rme-romlib,fvp-default:fvp-trp.tftf-tftf.rme b/group/tf-l1-build-fvp/fvp-mb-romlib-rme-rss,fvp-rme:nil
similarity index 98%
rename from group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-mb-rme-romlib,fvp-default:fvp-trp.tftf-tftf.rme
rename to group/tf-l1-build-fvp/fvp-mb-romlib-rme-rss,fvp-rme:nil
index 0849ee7..35f8713 100644
--- a/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-mb-rme-romlib,fvp-default:fvp-trp.tftf-tftf.rme
+++ b/group/tf-l1-build-fvp/fvp-mb-romlib-rme-rss,fvp-rme:nil
@@ -3,4 +3,3 @@
#
# SPDX-License-Identifier: BSD-3-Clause
#
-
diff --git a/group/tf-l1-build-fvp/fvp-rme:nil b/group/tf-l1-build-fvp/fvp-rme,fvp-rme:nil
similarity index 100%
rename from group/tf-l1-build-fvp/fvp-rme:nil
rename to group/tf-l1-build-fvp/fvp-rme,fvp-rme:nil
diff --git a/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-rme-romlib,fvp-default:fvp-trp.tftf-tftf.rme b/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-mb-rme-romlib,fvp-rme:fvp-trp.tftf-tftf.rme
similarity index 100%
rename from group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-rme-romlib,fvp-default:fvp-trp.tftf-tftf.rme
rename to group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-mb-rme-romlib,fvp-rme:fvp-trp.tftf-tftf.rme
diff --git a/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-rme-romlib,fvp-default:fvp-trp.tftf-tftf.rme b/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-rme-romlib,fvp-rme:fvp-trp.tftf-tftf.rme
similarity index 100%
copy from group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-rme-romlib,fvp-default:fvp-trp.tftf-tftf.rme
copy to group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-rme-romlib,fvp-rme:fvp-trp.tftf-tftf.rme
diff --git a/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-rme-romlib,fvp-default:fvp-trp.tftf.mbedtls2-tftf.rme b/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-rme-romlib,fvp-rme:fvp-trp.tftf.mbedtls2-tftf.rme
similarity index 100%
rename from group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-rme-romlib,fvp-default:fvp-trp.tftf.mbedtls2-tftf.rme
rename to group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-rme-romlib,fvp-rme:fvp-trp.tftf.mbedtls2-tftf.rme
diff --git a/group/tftf-l2-fvp/fvp-mb-romlib-rme,fvp-rme:fvp-trp.tftf-tftf.rme b/group/tftf-l2-fvp/fvp-mb-romlib-rme,fvp-rme:fvp-trp.tftf-tftf.rme
new file mode 100644
index 0000000..5ad9633
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-mb-romlib-rme,fvp-rme:fvp-trp.tftf-tftf.rme
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2022, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp/fvp-rme,fvp-default:fvp-trp.tftf-tftf.rme b/group/tftf-l2-fvp/fvp-rme,fvp-rme:fvp-trp.tftf-tftf.rme
similarity index 100%
rename from group/tftf-l2-fvp/fvp-rme,fvp-default:fvp-trp.tftf-tftf.rme
rename to group/tftf-l2-fvp/fvp-rme,fvp-rme:fvp-trp.tftf-tftf.rme
diff --git a/tftf_config/fvp-invalid-access b/tftf_config/fvp-invalid-access
index ebb0144..db1dcb7 100644
--- a/tftf_config/fvp-invalid-access
+++ b/tftf_config/fvp-invalid-access
@@ -1,3 +1,4 @@
CROSS_COMPILE=aarch64-none-elf-
PLAT=fvp
TESTS=invalid-access
+ENABLE_REALM_PAYLOAD_TESTS=1
diff --git a/tftf_config/fvp-rme b/tftf_config/fvp-rme
new file mode 100644
index 0000000..2f2586c
--- /dev/null
+++ b/tftf_config/fvp-rme
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+ENABLE_REALM_PAYLOAD_TESTS=1