Attest: Rename files to follow naming convention
In TF-M test suites the source files only contain the name of the
tested partition only in abbreviated format. Rename the non-compliant
files in attestation test suite to maintain consistency in the
repository.
Signed-off-by: Tamas Ban <tamas.ban@arm.com>
Change-Id: I28e5b80b6d4c3f012fb897194912ebc41a24897a
diff --git a/test/framework/non_secure_suites.c b/test/framework/non_secure_suites.c
index ef3a94c..0bf20a9 100644
--- a/test/framework/non_secure_suites.c
+++ b/test/framework/non_secure_suites.c
@@ -14,7 +14,7 @@
#include "test/suites/its/non_secure/its_ns_tests.h"
#include "test/suites/audit/non_secure/audit_ns_tests.h"
#include "test/suites/crypto/non_secure/crypto_ns_tests.h"
-#include "test/suites/attestation/non_secure/attestation_ns_tests.h"
+#include "test/suites/attestation/non_secure/attest_ns_tests.h"
#include "test/suites/qcbor/non_secure/qcbor_ns_tests.h"
#include "test/suites/t_cose/non_secure/t_cose_ns_tests.h"
#include "test/suites/core/non_secure/core_ns_tests.h"
diff --git a/test/framework/secure_suites.c b/test/framework/secure_suites.c
index d89d27b..dc574c0 100644
--- a/test/framework/secure_suites.c
+++ b/test/framework/secure_suites.c
@@ -13,7 +13,7 @@
#include "test/suites/ps/secure/ps_tests.h"
#include "test/suites/its/secure/its_s_tests.h"
#include "test/suites/audit/secure/audit_s_tests.h"
-#include "test/suites/attestation/secure/attestation_s_tests.h"
+#include "test/suites/attestation/secure/attest_s_tests.h"
#include "test/suites/crypto/secure/crypto_s_tests.h"
#include "test/suites/ipc/secure/ipc_s_tests.h"
#include "test/suites/platform/secure/platform_s_tests.h"
diff --git a/test/suites/attestation/CMakeLists.inc b/test/suites/attestation/CMakeLists.inc
index 1a739f2..46744d4 100644
--- a/test/suites/attestation/CMakeLists.inc
+++ b/test/suites/attestation/CMakeLists.inc
@@ -49,23 +49,23 @@
if (SYMMETRIC_INITIAL_ATTESTATION)
list(APPEND ATTEST_TEST_SRC_S
- "${ATTESTATION_TEST_DIR}/secure/symmetric_attest_s_interface_testsuite.c"
- "${ATTESTATION_TEST_DIR}/attest_symmetric_iat_decode.c"
+ "${ATTESTATION_TEST_DIR}/secure/attest_symmetric_s_interface_testsuite.c"
+ "${ATTESTATION_TEST_DIR}/attest_token_decode_symmetric.c"
)
list(APPEND ATTEST_TEST_SRC_NS
- "${ATTESTATION_TEST_DIR}/non_secure/symmetric_attest_ns_interface_testsuite.c"
- "${ATTESTATION_TEST_DIR}/attest_symmetric_iat_decode.c"
+ "${ATTESTATION_TEST_DIR}/non_secure/attest_symmetric_ns_interface_testsuite.c"
+ "${ATTESTATION_TEST_DIR}/attest_token_decode_symmetric.c"
)
else()
list(APPEND ATTEST_TEST_SRC_S
- "${ATTESTATION_TEST_DIR}/secure/attestation_s_interface_testsuite.c"
+ "${ATTESTATION_TEST_DIR}/secure/attest_asymmetric_s_interface_testsuite.c"
"${ATTESTATION_TEST_DIR}/attest_public_key.c"
- "${ATTESTATION_TEST_DIR}/attest_token_decode.c"
+ "${ATTESTATION_TEST_DIR}/attest_token_decode_asymmetric.c"
)
list(APPEND ATTEST_TEST_SRC_NS
- "${ATTESTATION_TEST_DIR}/non_secure/attestation_ns_interface_testsuite.c"
+ "${ATTESTATION_TEST_DIR}/non_secure/attest_asymmetric_ns_interface_testsuite.c"
"${ATTESTATION_TEST_DIR}/attest_public_key.c"
- "${ATTESTATION_TEST_DIR}/attest_token_decode.c"
+ "${ATTESTATION_TEST_DIR}/attest_token_decode_asymmetric.c"
)
endif()
diff --git a/test/suites/attestation/attestation_tests_common.h b/test/suites/attestation/attest_tests_common.h
similarity index 100%
rename from test/suites/attestation/attestation_tests_common.h
rename to test/suites/attestation/attest_tests_common.h
diff --git a/test/suites/attestation/attest_token_decode.c b/test/suites/attestation/attest_token_decode_asymmetric.c
similarity index 100%
rename from test/suites/attestation/attest_token_decode.c
rename to test/suites/attestation/attest_token_decode_asymmetric.c
diff --git a/test/suites/attestation/attest_symmetric_iat_decode.c b/test/suites/attestation/attest_token_decode_symmetric.c
similarity index 100%
rename from test/suites/attestation/attest_symmetric_iat_decode.c
rename to test/suites/attestation/attest_token_decode_symmetric.c
diff --git a/test/suites/attestation/non_secure/attestation_ns_interface_testsuite.c b/test/suites/attestation/non_secure/attest_asymmetric_ns_interface_testsuite.c
similarity index 98%
rename from test/suites/attestation/non_secure/attestation_ns_interface_testsuite.c
rename to test/suites/attestation/non_secure/attest_asymmetric_ns_interface_testsuite.c
index 1be9949..81f102f 100644
--- a/test/suites/attestation/non_secure/attestation_ns_interface_testsuite.c
+++ b/test/suites/attestation/non_secure/attest_asymmetric_ns_interface_testsuite.c
@@ -5,10 +5,10 @@
*
*/
-#include "attestation_ns_tests.h"
+#include "attest_ns_tests.h"
#include "psa/initial_attestation.h"
#include "attest.h"
-#include "../attestation_tests_common.h"
+#include "../attest_tests_common.h"
#include "../attest_token_test_values.h"
#include "../attest_token_test.h"
diff --git a/test/suites/attestation/non_secure/attestation_ns_tests.h b/test/suites/attestation/non_secure/attest_ns_tests.h
similarity index 100%
rename from test/suites/attestation/non_secure/attestation_ns_tests.h
rename to test/suites/attestation/non_secure/attest_ns_tests.h
diff --git a/test/suites/attestation/non_secure/symmetric_attest_ns_interface_testsuite.c b/test/suites/attestation/non_secure/attest_symmetric_ns_interface_testsuite.c
similarity index 98%
rename from test/suites/attestation/non_secure/symmetric_attest_ns_interface_testsuite.c
rename to test/suites/attestation/non_secure/attest_symmetric_ns_interface_testsuite.c
index a4f2bf0..7929dfa 100644
--- a/test/suites/attestation/non_secure/symmetric_attest_ns_interface_testsuite.c
+++ b/test/suites/attestation/non_secure/attest_symmetric_ns_interface_testsuite.c
@@ -5,10 +5,10 @@
*
*/
-#include "attestation_ns_tests.h"
+#include "attest_ns_tests.h"
#include "psa/initial_attestation.h"
#include "secure_fw/partitions/initial_attestation/attest.h"
-#include "../attestation_tests_common.h"
+#include "../attest_tests_common.h"
#include "../attest_token_test_values.h"
#include "../attest_token_test.h"
diff --git a/test/suites/attestation/secure/attestation_s_interface_testsuite.c b/test/suites/attestation/secure/attest_asymmetric_s_interface_testsuite.c
similarity index 98%
rename from test/suites/attestation/secure/attestation_s_interface_testsuite.c
rename to test/suites/attestation/secure/attest_asymmetric_s_interface_testsuite.c
index 61a8cfb..ea277a8 100644
--- a/test/suites/attestation/secure/attestation_s_interface_testsuite.c
+++ b/test/suites/attestation/secure/attest_asymmetric_s_interface_testsuite.c
@@ -5,10 +5,10 @@
*
*/
-#include "attestation_s_tests.h"
+#include "attest_s_tests.h"
#include "psa/initial_attestation.h"
#include "secure_fw/partitions/initial_attestation/attest.h"
-#include "../attestation_tests_common.h"
+#include "../attest_tests_common.h"
#include "../attest_token_test_values.h"
#include "../attest_token_test.h"
diff --git a/test/suites/attestation/secure/attestation_s_tests.h b/test/suites/attestation/secure/attest_s_tests.h
similarity index 100%
rename from test/suites/attestation/secure/attestation_s_tests.h
rename to test/suites/attestation/secure/attest_s_tests.h
diff --git a/test/suites/attestation/secure/symmetric_attest_s_interface_testsuite.c b/test/suites/attestation/secure/attest_symmetric_s_interface_testsuite.c
similarity index 98%
rename from test/suites/attestation/secure/symmetric_attest_s_interface_testsuite.c
rename to test/suites/attestation/secure/attest_symmetric_s_interface_testsuite.c
index fdaff78..1eff550 100644
--- a/test/suites/attestation/secure/symmetric_attest_s_interface_testsuite.c
+++ b/test/suites/attestation/secure/attest_symmetric_s_interface_testsuite.c
@@ -5,10 +5,10 @@
*
*/
-#include "attestation_s_tests.h"
+#include "attest_s_tests.h"
#include "psa/initial_attestation.h"
#include "secure_fw/partitions/initial_attestation/attest.h"
-#include "../attestation_tests_common.h"
+#include "../attest_tests_common.h"
#include "../attest_token_test_values.h"
#include "../attest_token_test.h"