Fix: update broken b-test config
The file structure of deployments was changed without updating the
location of deployments in test_data.yaml. This made b-test fail to
build any deployments. Moreover new block-storage deployments
were missing too.
This change fixes the existing data and adds the block-storage
deployments.
Change-Id: Ibc4166b29d2499721eb80b3255814b81d4ba92be
Signed-off-by: Gyorgy Szing <Gyorgy.Szing@arm.com>
diff --git a/tools/b-test/test_data.yaml b/tools/b-test/test_data.yaml
index fd6f8c6..86216f5 100644
--- a/tools/b-test/test_data.yaml
+++ b/tools/b-test/test_data.yaml
@@ -6,56 +6,82 @@
$schema: ./test_data.schema.json,
data:
- - name: "attestation-opteesp-arm"
- src: "$TS_ROOT/deployments/attestation/opteesp"
+ - name: "attestation-default-opteesp"
+ src: "$TS_ROOT/deployments/attestation/config/default-opteesp"
params:
- "-GUnix Makefiles"
- - name: "attestation-sp-arm"
- src: "$TS_ROOT/deployments/attestation/sp"
+ - name: "attestation-default-sp"
+ src: "$TS_ROOT/deployments/attestation/config/default-sp"
+ params:
+ - "-GUnix Makefiles"
+ - name: "block-storage-cfi-flash-optee"
+ src: "$TS_ROOT/deployments/block-storage/config/cfi-flash-optee"
+ params:
+ - "-GUnix Makefiles"
+ - name: "block-storage-default-opteesp"
+ src: "$TS_ROOT/deployments/block-storage/config/default-opteesp"
+ params:
+ - "-GUnix Makefiles"
+ - name: "block-storage-default-sp"
+ src: "$TS_ROOT/deployments/block-storage/config/default-sp"
+ params:
+ - "-GUnix Makefiles"
+ - name: "block-storage-edk2-secure-flash-opteesp"
+ src: "$TS_ROOT/deployments/block-storage/config/edk2-secure-flash-opteesp"
+ params:
+ - "-GUnix Makefiles"
+ - name: "block-storage-semihosted-opteesp"
+ src: "$TS_ROOT/deployments/block-storage/config/semihosted-opteesp"
params:
- "-GUnix Makefiles"
- name: "component-test-arm-linux"
src: "$TS_ROOT/deployments/component-test/arm-linux"
os_id : "GNU/Linux"
params:
- - "-GUnix Makefiles"
- - name: "component-test-pc-linux"
- os_id : "GNU/Linux"
+ - "-GUnix Makefiles"
+ - name: "component-test-linux-pc"
src: "$TS_ROOT/deployments/component-test/linux-pc"
- params:
- - "-GUnix Makefiles"
- - name: "crypto-opteesp-arm"
- src: "$TS_ROOT/deployments/crypto/opteesp"
- params:
- - "-GUnix Makefiles"
- - 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: "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"
+ os_id : "GNU/Linux"
params:
- "-GUnix Makefiles"
- - "-DCMAKE_VERBOSE_MAKEFILE=y"
- - name: "internal-trusted-storage-sp-arm"
- src: "$TS_ROOT/deployments/internal-trusted-storage/sp"
+ - name: "crypto-default-opteesp"
+ src: "$TS_ROOT/deployments/crypto/config/default-opteesp"
params:
- "-GUnix Makefiles"
- - "-DCMAKE_VERBOSE_MAKEFILE=y"
+ - name: "crypto-default-sp"
+ src: "$TS_ROOT/deployments/crypto/config/default-sp"
+ params:
+ - "-GUnix Makefiles"
+ - name: "env-test-baremetal-fvp_base_revc-opteesp"
+ src: "$TS_ROOT/deployments/env-test/config/baremetal-fvp_base_revc-opteesp"
+ params:
+ - "-GUnix Makefiles"
+ - name: "env-test-baremetal-fvp_base_revc-sp"
+ src: "$TS_ROOT/deployments/env-test/config/baremetal-fvp_base_revc-sp"
+ params:
+ - "-GUnix Makefiles"
+ - name: "env-test-n1sdp-opteesp"
+ src: "$TS_ROOT/deployments/env-test/config/n1sdp-opteesp"
+ params:
+ - "-GUnix Makefiles"
+ - name: "internal-trusted-storage-default-opteesp"
+ src: "$TS_ROOT/deployments/internal-trusted-storage/config/default-opteesp"
+ params:
+ - "-GUnix Makefiles"
+ - name: "internal-trusted-storage-default-sp"
+ src: "$TS_ROOT/deployments/internal-trusted-storage/config/default-sp"
+ params:
+ - "-GUnix Makefiles"
+ - name: "internal-trusted-storage-shared-flash-opteesp"
+ src: "$TS_ROOT/deployments/internal-trusted-storage/config/shared-flash-opteesp"
+ params:
+ - "-GUnix Makefiles"
- name: "libsp-linux-pc"
src: "$TS_ROOT/deployments/libsp/linux-pc"
os_id : "GNU/Linux"
params:
- "-GUnix Makefiles"
- - name: "libsp-optee-arm"
+ - name: "libsp-opteesp"
src: "$TS_ROOT/deployments/libsp/opteesp"
params:
- "-GUnix Makefiles"
@@ -64,114 +90,107 @@
os_id : "GNU/Linux"
params:
- "-GUnix Makefiles"
- - name: "libts-pc-linux"
+ - name: "libts-linux-pc"
src: "$TS_ROOT/deployments/libts/linux-pc"
os_id : "GNU/Linux"
params:
- "-GUnix Makefiles"
- - name: "newlib-optee-arm"
+ - name: "newlib-opteesp"
src: "$TS_ROOT/deployments/newlib/opteesp"
params:
- - "-GUnix Makefiles"
+ - "-GUnix Makefiles"
- name: "platform-inspect-arm-linux"
src: "$TS_ROOT/deployments/platform-inspect/arm-linux"
os_id : "GNU/Linux"
params:
- - "-GUnix Makefiles"
- - name: "platform-inspect-pc-linux"
+ - "-GUnix Makefiles"
+ - name: "platform-inspect-linux-pc"
src: "$TS_ROOT/deployments/platform-inspect/linux-pc"
os_id : "GNU/Linux"
params:
- - "-GUnix Makefiles"
- - name: "protected-storage-opteesp-arm"
- src: "$TS_ROOT/deployments/protected-storage/opteesp"
+ - "-GUnix Makefiles"
+ - name: "protected-storage-default-opteesp"
+ src: "$TS_ROOT/deployments/protected-storage/config/default-opteesp"
params:
- "-GUnix Makefiles"
- - "-DCMAKE_VERBOSE_MAKEFILE=y"
- - name: "protected-storage-sp-arm"
- src: "$TS_ROOT/deployments/protected-storage/sp"
+ - name: "protected-storage-default-sp"
+ src: "$TS_ROOT/deployments/protected-storage/config/default-sp"
params:
- "-GUnix Makefiles"
- - "-DCMAKE_VERBOSE_MAKEFILE=y"
- - name: "psa-api-test-crypto-arm-linux"
+ - name: "protected-storage-shared-flash-opteesp"
+ src: "$TS_ROOT/deployments/protected-storage/config/shared-flash-opteesp"
+ params:
+ - "-GUnix Makefiles"
+ - name: "psa-api-test-crypto"
src: "$TS_ROOT/deployments/psa-api-test/crypto/arm-linux"
- os_id : "GNU/Linux"
params:
- "-GUnix Makefiles"
- - name: "psa-api-test-crypto-pc-linux"
+ - name: "psa-api-test-crypto"
src: "$TS_ROOT/deployments/psa-api-test/crypto/linux-pc"
- os_id : "GNU/Linux"
params:
- "-GUnix Makefiles"
- - name: "psa-api-test-initial_attestation-arm-linux"
+ - name: "psa-api-test-initial_attestation"
src: "$TS_ROOT/deployments/psa-api-test/initial_attestation/arm-linux"
- os_id : "GNU/Linux"
params:
- "-GUnix Makefiles"
- - name: "psa-api-test-initial_attestation-pc-linux"
+ - name: "psa-api-test-initial_attestation"
src: "$TS_ROOT/deployments/psa-api-test/initial_attestation/linux-pc"
- os_id : "GNU/Linux"
params:
- "-GUnix Makefiles"
- - name: "psa-api-test-internal_trusted_storage-arm-linux"
+ - name: "psa-api-test-internal_trusted_storage"
src: "$TS_ROOT/deployments/psa-api-test/internal_trusted_storage/arm-linux"
- os_id : "GNU/Linux"
params:
- "-GUnix Makefiles"
- - name: "psa-api-test-internal_trusted_storage-pc-linux"
+ - name: "psa-api-test-internal_trusted_storage"
src: "$TS_ROOT/deployments/psa-api-test/internal_trusted_storage/linux-pc"
- os_id : "GNU/Linux"
params:
- "-GUnix Makefiles"
- - name: "psa-api-test-protected_storage-arm-linux"
+ - name: "psa-api-test-protected_storage"
src: "$TS_ROOT/deployments/psa-api-test/protected_storage/arm-linux"
- os_id : "GNU/Linux"
params:
- "-GUnix Makefiles"
- - name: "psa-api-test-protected_storage-pc-linux"
+ - name: "psa-api-test-protected_storage"
src: "$TS_ROOT/deployments/psa-api-test/protected_storage/linux-pc"
- os_id : "GNU/Linux"
params:
- "-GUnix Makefiles"
- - name: "se-proxy-opteesp-arm"
- src: "$TS_ROOT/deployments/se-proxy/opteesp"
+ - name: "se-proxy-default-opteesp"
+ src: "$TS_ROOT/deployments/se-proxy/config/default-opteesp"
params:
- "-GUnix Makefiles"
- - name: "se-proxy-sp-arm"
- src: "$TS_ROOT/deployments/se-proxy/sp"
+ - name: "se-proxy-default-sp"
+ src: "$TS_ROOT/deployments/se-proxy/config/default-sp"
params:
- "-GUnix Makefiles"
- - name: "sfs-demo-opteesp-arm"
+ - name: "sfs-demo-opteesp"
src: "$TS_ROOT/deployments/sfs-demo/opteesp"
params:
- - "-GUnix Makefiles"
- - name: "sfs-demo-sp-arm"
+ - "-GUnix Makefiles"
+ - name: "sfs-demo-sp"
src: "$TS_ROOT/deployments/sfs-demo/sp"
params:
- - "-GUnix Makefiles"
- - name: "smm-gateway-pc-linux"
- src: "$TS_ROOT/deployments/smm-gateway/linux-pc"
+ - "-GUnix Makefiles"
+ - name: "smm-gateway-default-opteesp"
+ src: "$TS_ROOT/deployments/smm-gateway/config/default-opteesp"
params:
- "-GUnix Makefiles"
- - name: "smm-gateway-opteesp-arm"
- src: "$TS_ROOT/deployments/smm-gateway/opteesp"
+ - name: "smm-gateway-default-sp"
+ src: "$TS_ROOT/deployments/smm-gateway/config/default-sp"
params:
- "-GUnix Makefiles"
- - "-DCMAKE_VERBOSE_MAKEFILE=y"
- - name: "smm-gateway-sp-arm"
- src: "$TS_ROOT/deployments/smm-gateway/sp"
+ - name: "smm-gateway-linux-pc"
+ src: "$TS_ROOT/deployments/smm-gateway/config/linux-pc"
+ os_id : "GNU/Linux"
params:
- "-GUnix Makefiles"
- - "-DCMAKE_VERBOSE_MAKEFILE=y"
- - name: "spm-test1-opteesp-arm"
+ - name: "spm-test1-opteesp"
src: "$TS_ROOT/deployments/spm-test1/opteesp"
params:
- "-GUnix Makefiles"
- - name: "spm-test2-opteesp-arm"
+ - name: "spm-test2-opteesp"
src: "$TS_ROOT/deployments/spm-test2/opteesp"
params:
- "-GUnix Makefiles"
- - name: "spm-test3-opteesp-arm"
+ - name: "spm-test3-opteesp"
src: "$TS_ROOT/deployments/spm-test3/opteesp"
params:
- "-GUnix Makefiles"
@@ -179,39 +198,39 @@
src: "$TS_ROOT/deployments/ts-demo/arm-linux"
os_id : "GNU/Linux"
params:
- - "-GUnix Makefiles"
- - name: "ts-demo-pc-linux"
+ - "-GUnix Makefiles"
+ - name: "ts-demo-linux-pc"
src: "$TS_ROOT/deployments/ts-demo/linux-pc"
os_id : "GNU/Linux"
params:
- - "-GUnix Makefiles"
+ - "-GUnix Makefiles"
- name: "ts-remote-test-arm-linux"
src: "$TS_ROOT/deployments/ts-remote-test/arm-linux"
os_id : "GNU/Linux"
params:
- - "-GUnix Makefiles"
- - name: "ts-remote-test-pc-linux"
+ - "-GUnix Makefiles"
+ - name: "ts-remote-test-linux-pc"
src: "$TS_ROOT/deployments/ts-remote-test/linux-pc"
os_id : "GNU/Linux"
params:
- - "-GUnix Makefiles"
+ - "-GUnix Makefiles"
- name: "ts-service-test-arm-linux"
src: "$TS_ROOT/deployments/ts-service-test/arm-linux"
os_id : "GNU/Linux"
params:
- - "-GUnix Makefiles"
- - name: "ts-service-test-pc-linux"
+ - "-GUnix Makefiles"
+ - name: "ts-service-test-linux-pc"
src: "$TS_ROOT/deployments/ts-service-test/linux-pc"
os_id : "GNU/Linux"
params:
- - "-GUnix Makefiles"
- - name: "uefi-test-pc-linux"
- src: "$TS_ROOT/deployments/uefi-test/linux-pc"
- os_id : "GNU/Linux"
- params:
- - "-GUnix Makefiles"
+ - "-GUnix Makefiles"
- name: "uefi-test-arm-linux"
src: "$TS_ROOT/deployments/uefi-test/arm-linux"
os_id : "GNU/Linux"
params:
- - "-GUnix Makefiles"
+ - "-GUnix Makefiles"
+ - name: "uefi-test-linux-pc"
+ src: "$TS_ROOT/deployments/uefi-test/linux-pc"
+ os_id : "GNU/Linux"
+ params:
+ - "-GUnix Makefiles"