commit 840ded21ce149e76c91a4576097e5b42253ee2c4
author Imre Kis <imre.kis@arm.com> Thu Jan 13 15:32:01 2022 +0100
committer György Szing <gyorgy.szing@arm.com> Mon May 09 12:18:16 2022 +0200
tree e26d0ef2c141637759fd50607c8f4a379a6711d0
parent 686bd27dd487523010a15ecdf977554bcd548507

Add generic SP deployments for the existing SPs

Introduce new deployments for building SPs using the 'sp' environment
which produces generic (non-OP-TEE specific) SP binaries.
Add new deployments to b-test list.

Signed-off-by: Imre Kis <imre.kis@arm.com>
Change-Id: Ice721dc262bcc7be23f7c2f8ca59ed53bf0e3633

tools/b-test/test_data.yaml

diff --git a/tools/b-test/test_data.yaml b/tools/b-test/test_data.yaml
index 0731d48..7caafa8 100644
--- a/tools/b-test/test_data.yaml
+++ b/tools/b-test/test_data.yaml
@@ -1,15 +1,19 @@
 #
-# Copyright (c) 2020-2021, Arm Limited and Contributors. All rights reserved.
+# Copyright (c) 2020-2022, Arm Limited and Contributors. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
 $schema: ./test_data.schema.json,
 data:
-    - name: "attestation-optee-arm"
+    - name: "attestation-opteesp-arm"
       src: "$TS_ROOT/deployments/attestation/opteesp"
       params:
             - "-GUnix Makefiles"
+    - name: "attestation-sp-arm"
+      src: "$TS_ROOT/deployments/attestation/sp"
+      params:
+            - "-GUnix Makefiles"
     - name: "component-test-arm-linux"
       src: "$TS_ROOT/deployments/component-test/arm-linux"
       os_id : "GNU/Linux"
@@ -20,19 +24,32 @@
       src: "$TS_ROOT/deployments/component-test/linux-pc"
       params:
           - "-GUnix Makefiles"
-    - name: "crypto-optee-arm"
+    - name: "crypto-opteesp-arm"
       src: "$TS_ROOT/deployments/crypto/opteesp"
       params:
           - "-GUnix Makefiles"
-    - name: "env-test-optee-arm"
+    - name: "crypto-sp-arm"
+      src: "$TS_ROOT/deployments/crypto/sp"
+      params:
+          - "-GUnix Makefiles"
+    - name: "env-test-opteesp-arm"
       src: "$TS_ROOT/deployments/env-test/opteesp"
       params:
           - "-GUnix Makefiles"
-    - name: "internal-trusted-storage-optee-arm"
+    - name: "env-test-sp-arm"
+      src: "$TS_ROOT/deployments/env-test/sp"
+      params:
+          - "-GUnix Makefiles"
+    - name: "internal-trusted-storage-opteesp-arm"
       src: "$TS_ROOT/deployments/internal-trusted-storage/opteesp"
       params:
             - "-GUnix Makefiles"
             - "-DCMAKE_VERBOSE_MAKEFILE=y"
+    - name: "internal-trusted-storage-sp-arm"
+      src: "$TS_ROOT/deployments/internal-trusted-storage/sp"
+      params:
+            - "-GUnix Makefiles"
+            - "-DCMAKE_VERBOSE_MAKEFILE=y"
     - name: "libsp-linux-pc"
       src: "$TS_ROOT/deployments/libsp/linux-pc"
       os_id : "GNU/Linux"
@@ -62,11 +79,16 @@
       os_id : "GNU/Linux"
       params:
           - "-GUnix Makefiles"
-    - name: "protected-storage-optee-arm"
+    - name: "protected-storage-opteesp-arm"
       src: "$TS_ROOT/deployments/protected-storage/opteesp"
       params:
             - "-GUnix Makefiles"
             - "-DCMAKE_VERBOSE_MAKEFILE=y"
+    - name: "protected-storage-sp-arm"
+      src: "$TS_ROOT/deployments/protected-storage/sp"
+      params:
+            - "-GUnix Makefiles"
+            - "-DCMAKE_VERBOSE_MAKEFILE=y"
     - name: "psa-api-test-crypto-arm-linux"
       src: "$TS_ROOT/deployments/psa-api-test/crypto/arm-linux"
       os_id : "GNU/Linux"
@@ -107,23 +129,36 @@
       os_id : "GNU/Linux"
       params:
             - "-GUnix Makefiles"
-    - name: "se-proxy-optee-arm"
+    - name: "se-proxy-opteesp-arm"
       src: "$TS_ROOT/deployments/se-proxy/opteesp"
       params:
             - "-GUnix Makefiles"
-    - name: "sfs-demo-optee-arm"
+    - name: "se-proxy-sp-arm"
+      src: "$TS_ROOT/deployments/se-proxy/sp"
+      params:
+            - "-GUnix Makefiles"
+    - name: "sfs-demo-opteesp-arm"
       src: "$TS_ROOT/deployments/sfs-demo/opteesp"
       params:
           - "-GUnix Makefiles"
+    - name: "sfs-demo-sp-arm"
+      src: "$TS_ROOT/deployments/sfs-demo/sp"
+      params:
+          - "-GUnix Makefiles"
     - name: "smm-gateway-pc-linux"
       src: "$TS_ROOT/deployments/smm-gateway/linux-pc"
       params:
             - "-GUnix Makefiles"
-    - name: "smm-gateway-optee-arm"
+    - name: "smm-gateway-opteesp-arm"
       src: "$TS_ROOT/deployments/smm-gateway/opteesp"
       params:
             - "-GUnix Makefiles"
             - "-DCMAKE_VERBOSE_MAKEFILE=y"
+    - name: "smm-gateway-sp-arm"
+      src: "$TS_ROOT/deployments/smm-gateway/sp"
+      params:
+            - "-GUnix Makefiles"
+            - "-DCMAKE_VERBOSE_MAKEFILE=y"
     - name: "ts-demo-arm-linux"
       src: "$TS_ROOT/deployments/ts-demo/arm-linux"
       os_id : "GNU/Linux"