Test: Unify manifest file name
Some test partition's manifest file name is not unified which causes
spreading and shows many similar but different names for headers and
partition sources.
Change-Id: Ib5cbfde5b29496333b8e9424a56a160627b22248
Signed-off-by: Ken Liu <Ken.Liu@arm.com>
diff --git a/test/test_services/tfm_core_test/psa_manifest/tfm_test_core.h b/test/test_services/tfm_core_test/psa_manifest/tfm_ss_core_test.h
similarity index 88%
rename from test/test_services/tfm_core_test/psa_manifest/tfm_test_core.h
rename to test/test_services/tfm_core_test/psa_manifest/tfm_ss_core_test.h
index e133c46..736bc9c 100644
--- a/test/test_services/tfm_core_test/psa_manifest/tfm_test_core.h
+++ b/test/test_services/tfm_core_test/psa_manifest/tfm_ss_core_test.h
@@ -7,8 +7,8 @@
/*********** WARNING: This is an auto-generated file. Do not edit! ***********/
-#ifndef __PSA_MANIFEST_TFM_TEST_CORE_H__
-#define __PSA_MANIFEST_TFM_TEST_CORE_H__
+#ifndef __PSA_MANIFEST_TFM_SS_CORE_TEST_H__
+#define __PSA_MANIFEST_TFM_SS_CORE_TEST_H__
#ifdef __cplusplus
extern "C" {
@@ -29,4 +29,4 @@
}
#endif
-#endif /* __PSA_MANIFEST_TFM_TEST_CORE_H__ */
+#endif /* __PSA_MANIFEST_TFM_SS_CORE_TEST_H__ */
diff --git a/test/test_services/tfm_core_test/tfm_ss_core_test.c b/test/test_services/tfm_core_test/tfm_ss_core_test.c
index 7390fc3..2576be9 100644
--- a/test/test_services/tfm_core_test/tfm_ss_core_test.c
+++ b/test/test_services/tfm_core_test/tfm_ss_core_test.c
@@ -16,7 +16,7 @@
#include "psa/service.h"
#include "tfm_plat_test.h"
#include "psa_manifest/pid.h"
-#include "psa_manifest/tfm_test_core.h"
+#include "psa_manifest/tfm_ss_core_test.h"
#ifdef TFM_PSA_API
#include "psa_manifest/sid.h"
#endif
diff --git a/test/test_services/tfm_core_test/tfm_test_core.yaml b/test/test_services/tfm_core_test/tfm_ss_core_test.yaml
similarity index 100%
rename from test/test_services/tfm_core_test/tfm_test_core.yaml
rename to test/test_services/tfm_core_test/tfm_ss_core_test.yaml
diff --git a/test/test_services/tfm_core_test_2/psa_manifest/tfm_test_core_2.h b/test/test_services/tfm_core_test_2/psa_manifest/tfm_ss_core_test_2.h
similarity index 83%
rename from test/test_services/tfm_core_test_2/psa_manifest/tfm_test_core_2.h
rename to test/test_services/tfm_core_test_2/psa_manifest/tfm_ss_core_test_2.h
index c636835..d39713e 100644
--- a/test/test_services/tfm_core_test_2/psa_manifest/tfm_test_core_2.h
+++ b/test/test_services/tfm_core_test_2/psa_manifest/tfm_ss_core_test_2.h
@@ -7,8 +7,8 @@
/*********** WARNING: This is an auto-generated file. Do not edit! ***********/
-#ifndef __PSA_MANIFEST_TFM_TEST_CORE_2_H__
-#define __PSA_MANIFEST_TFM_TEST_CORE_2_H__
+#ifndef __PSA_MANIFEST_TFM_SS_CORE_TEST_2_H__
+#define __PSA_MANIFEST_TFM_SS_CORE_TEST_2_H__
#ifdef __cplusplus
extern "C" {
@@ -25,4 +25,4 @@
}
#endif
-#endif /* __PSA_MANIFEST_TFM_TEST_CORE_2_H__ */
+#endif /* __PSA_MANIFEST_TFM_SS_CORE_TEST_2_H__ */
diff --git a/test/test_services/tfm_core_test_2/tfm_ss_core_test_2.c b/test/test_services/tfm_core_test_2/tfm_ss_core_test_2.c
index e9d8c95..9107ddf 100644
--- a/test/test_services/tfm_core_test_2/tfm_ss_core_test_2.c
+++ b/test/test_services/tfm_core_test_2/tfm_ss_core_test_2.c
@@ -12,7 +12,7 @@
#include "tfm_secure_api.h"
#include "psa/service.h"
#include "psa_manifest/pid.h"
-#include "psa_manifest/tfm_test_core_2.h"
+#include "psa_manifest/tfm_ss_core_test_2.h"
#define INVALID_NS_CLIENT_ID 0x49abcdef
#define INVERT_BUFFER_SIZE (16*4)
diff --git a/test/test_services/tfm_core_test_2/tfm_test_core_2.yaml b/test/test_services/tfm_core_test_2/tfm_ss_core_test_2.yaml
similarity index 100%
rename from test/test_services/tfm_core_test_2/tfm_test_core_2.yaml
rename to test/test_services/tfm_core_test_2/tfm_ss_core_test_2.yaml
diff --git a/test/test_services/tfm_ipc_client/psa_manifest/tfm_ipc_client_partition.h b/test/test_services/tfm_ipc_client/psa_manifest/tfm_ipc_client_test.h
similarity index 80%
rename from test/test_services/tfm_ipc_client/psa_manifest/tfm_ipc_client_partition.h
rename to test/test_services/tfm_ipc_client/psa_manifest/tfm_ipc_client_test.h
index d6d7513..da942bb 100644
--- a/test/test_services/tfm_ipc_client/psa_manifest/tfm_ipc_client_partition.h
+++ b/test/test_services/tfm_ipc_client/psa_manifest/tfm_ipc_client_test.h
@@ -7,8 +7,8 @@
/*********** WARNING: This is an auto-generated file. Do not edit! ***********/
-#ifndef __PSA_MANIFEST_TFM_IPC_CLIENT_PARTITION_H__
-#define __PSA_MANIFEST_TFM_IPC_CLIENT_PARTITION_H__
+#ifndef __PSA_MANIFEST_TFM_IPC_CLIENT_TEST_H__
+#define __PSA_MANIFEST_TFM_IPC_CLIENT_TEST_H__
#ifdef __cplusplus
extern "C" {
@@ -24,4 +24,4 @@
}
#endif
-#endif /* __PSA_MANIFEST_TFM_IPC_CLIENT_PARTITION_H__ */
+#endif /* __PSA_MANIFEST_TFM_IPC_CLIENT_TEST_H__ */
diff --git a/test/test_services/tfm_ipc_client/tfm_ipc_client_test.c b/test/test_services/tfm_ipc_client/tfm_ipc_client_test.c
index 40c5560..2528e16 100644
--- a/test/test_services/tfm_ipc_client/tfm_ipc_client_test.c
+++ b/test/test_services/tfm_ipc_client/tfm_ipc_client_test.c
@@ -9,7 +9,7 @@
#include <assert.h>
#include "psa/client.h"
#include "psa/service.h"
-#include "psa_manifest/tfm_ipc_client_partition.h"
+#include "psa_manifest/tfm_ipc_client_test.h"
#include "utilities.h"
#include "psa_manifest/sid.h"
diff --git a/test/test_services/tfm_ipc_client/tfm_ipc_client_partition.yaml b/test/test_services/tfm_ipc_client/tfm_ipc_client_test.yaml
similarity index 100%
rename from test/test_services/tfm_ipc_client/tfm_ipc_client_partition.yaml
rename to test/test_services/tfm_ipc_client/tfm_ipc_client_test.yaml
diff --git a/test/test_services/tfm_ipc_service/psa_manifest/tfm_ipc_service_partition.h b/test/test_services/tfm_ipc_service/psa_manifest/tfm_ipc_service_test.h
similarity index 80%
rename from test/test_services/tfm_ipc_service/psa_manifest/tfm_ipc_service_partition.h
rename to test/test_services/tfm_ipc_service/psa_manifest/tfm_ipc_service_test.h
index 47427a0..78af7d9 100644
--- a/test/test_services/tfm_ipc_service/psa_manifest/tfm_ipc_service_partition.h
+++ b/test/test_services/tfm_ipc_service/psa_manifest/tfm_ipc_service_test.h
@@ -7,8 +7,8 @@
/*********** WARNING: This is an auto-generated file. Do not edit! ***********/
-#ifndef __PSA_MANIFEST_TFM_IPC_SERVICE_PARTITION_H__
-#define __PSA_MANIFEST_TFM_IPC_SERVICE_PARTITION_H__
+#ifndef __PSA_MANIFEST_TFM_IPC_SERVICE_TEST_H__
+#define __PSA_MANIFEST_TFM_IPC_SERVICE_TEST_H__
#ifdef __cplusplus
extern "C" {
@@ -24,4 +24,4 @@
}
#endif
-#endif /* __PSA_MANIFEST_TFM_IPC_SERVICE_PARTITION_H__ */
+#endif /* __PSA_MANIFEST_TFM_IPC_SERVICE_TEST_H__ */
diff --git a/test/test_services/tfm_ipc_service/tfm_ipc_service_test.c b/test/test_services/tfm_ipc_service/tfm_ipc_service_test.c
index ad7d1f2..09f37d3 100644
--- a/test/test_services/tfm_ipc_service/tfm_ipc_service_test.c
+++ b/test/test_services/tfm_ipc_service/tfm_ipc_service_test.c
@@ -12,7 +12,7 @@
#include "psa/service.h"
#include "tfm_secure_api.h"
#include "tfm_api.h"
-#include "psa_manifest/tfm_ipc_service_partition.h"
+#include "psa_manifest/tfm_ipc_service_test.h"
#define IPC_SERVICE_BUFFER_LEN 32
diff --git a/test/test_services/tfm_ipc_service/tfm_ipc_service_partition.yaml b/test/test_services/tfm_ipc_service/tfm_ipc_service_test.yaml
similarity index 100%
rename from test/test_services/tfm_ipc_service/tfm_ipc_service_partition.yaml
rename to test/test_services/tfm_ipc_service/tfm_ipc_service_test.yaml
diff --git a/test/test_services/tfm_secure_client_service/psa_manifest/tfm_test_client_service.h b/test/test_services/tfm_secure_client_service/psa_manifest/tfm_secure_client_service.h
similarity index 68%
rename from test/test_services/tfm_secure_client_service/psa_manifest/tfm_test_client_service.h
rename to test/test_services/tfm_secure_client_service/psa_manifest/tfm_secure_client_service.h
index 2e03069..cc0699f 100644
--- a/test/test_services/tfm_secure_client_service/psa_manifest/tfm_test_client_service.h
+++ b/test/test_services/tfm_secure_client_service/psa_manifest/tfm_secure_client_service.h
@@ -7,8 +7,8 @@
/*********** WARNING: This is an auto-generated file. Do not edit! ***********/
-#ifndef __PSA_MANIFEST_TFM_TEST_CLIENT_SERVICE_H__
-#define __PSA_MANIFEST_TFM_TEST_CLIENT_SERVICE_H__
+#ifndef __PSA_MANIFEST_TFM_SECURE_CLIENT_SERVICE_H__
+#define __PSA_MANIFEST_TFM_SECURE_CLIENT_SERVICE_H__
#ifdef __cplusplus
extern "C" {
@@ -20,4 +20,4 @@
}
#endif
-#endif /* __PSA_MANIFEST_TFM_TEST_CLIENT_SERVICE_H__ */
+#endif /* __PSA_MANIFEST_TFM_SECURE_CLIENT_SERVICE_H__ */
diff --git a/test/test_services/tfm_secure_client_service/tfm_secure_client_service.c b/test/test_services/tfm_secure_client_service/tfm_secure_client_service.c
index 62a8b5d..c2e2558 100644
--- a/test/test_services/tfm_secure_client_service/tfm_secure_client_service.c
+++ b/test/test_services/tfm_secure_client_service/tfm_secure_client_service.c
@@ -10,7 +10,7 @@
#ifdef TFM_PSA_API
#include "psa/client.h"
#include "psa/service.h"
-#include "psa_manifest/tfm_test_client_service.h"
+#include "psa_manifest/tfm_secure_client_service.h"
#endif
/**
diff --git a/test/test_services/tfm_secure_client_service/tfm_test_client_service.yaml b/test/test_services/tfm_secure_client_service/tfm_secure_client_service.yaml
similarity index 100%
rename from test/test_services/tfm_secure_client_service/tfm_test_client_service.yaml
rename to test/test_services/tfm_secure_client_service/tfm_secure_client_service.yaml