From ce1d8d2c4ed4e5f11384374b5bd49327a590583e Mon Sep 17 00:00:00 2001
From: Ronald Cron <ronald.cron@arm.com>
Date: Fri, 30 Apr 2021 17:00:34 +0200
Subject: [PATCH] tests: Revert test_driver.h name change

Signed-off-by: Ronald Cron <ronald.cron@arm.com>
---
 library/psa_crypto_driver_wrappers.c                           | 2 +-
 .../test/drivers/{mbedtls_test_driver.h => test_driver.h}      | 0
 tests/src/drivers/platform_builtin_keys.c                      | 2 +-
 tests/suites/test_suite_psa_crypto_driver_wrappers.function    | 2 +-
 visualc/VS2010/mbedTLS.vcxproj                                 | 3 +--
 5 files changed, 4 insertions(+), 5 deletions(-)
 rename tests/include/test/drivers/{mbedtls_test_driver.h => test_driver.h} (100%)

diff --git a/library/psa_crypto_driver_wrappers.c b/library/psa_crypto_driver_wrappers.c
index d6e9e148f9..9bef02cd00 100644
--- a/library/psa_crypto_driver_wrappers.c
+++ b/library/psa_crypto_driver_wrappers.c
@@ -37,7 +37,7 @@
 #ifndef PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT
 #define PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT
 #endif
-#include "test/drivers/mbedtls_test_driver.h"
+#include "test/drivers/test_driver.h"
 #endif /* PSA_CRYPTO_DRIVER_TEST */
 
 /* Repeat above block for each JSON-declared driver during autogeneration */
diff --git a/tests/include/test/drivers/mbedtls_test_driver.h b/tests/include/test/drivers/test_driver.h
similarity index 100%
rename from tests/include/test/drivers/mbedtls_test_driver.h
rename to tests/include/test/drivers/test_driver.h
diff --git a/tests/src/drivers/platform_builtin_keys.c b/tests/src/drivers/platform_builtin_keys.c
index 57d040a787..759fa78309 100644
--- a/tests/src/drivers/platform_builtin_keys.c
+++ b/tests/src/drivers/platform_builtin_keys.c
@@ -24,7 +24,7 @@
 #include <psa/crypto_extra.h>
 
 #if defined(PSA_CRYPTO_DRIVER_TEST)
-#include <test/drivers/mbedtls_test_driver.h>
+#include <test/drivers/test_driver.h>
 #endif
 
 typedef struct
diff --git a/tests/suites/test_suite_psa_crypto_driver_wrappers.function b/tests/suites/test_suite_psa_crypto_driver_wrappers.function
index 3c48b06ac4..ce27a8b0e9 100644
--- a/tests/suites/test_suite_psa_crypto_driver_wrappers.function
+++ b/tests/suites/test_suite_psa_crypto_driver_wrappers.function
@@ -1,5 +1,5 @@
 /* BEGIN_HEADER */
-#include "test/drivers/mbedtls_test_driver.h"
+#include "test/drivers/test_driver.h"
 /* END_HEADER */
 
 /* BEGIN_DEPENDENCIES
diff --git a/visualc/VS2010/mbedTLS.vcxproj b/visualc/VS2010/mbedTLS.vcxproj
index 8cc1dbf44b..c3e1d026a4 100644
--- a/visualc/VS2010/mbedTLS.vcxproj
+++ b/visualc/VS2010/mbedTLS.vcxproj
@@ -234,9 +234,9 @@
     <ClInclude Include="..\..\tests\include\test\drivers\cipher.h" />
     <ClInclude Include="..\..\tests\include\test\drivers\hash.h" />
     <ClInclude Include="..\..\tests\include\test\drivers\key_management.h" />
-    <ClInclude Include="..\..\tests\include\test\drivers\mbedtls_test_driver.h" />
     <ClInclude Include="..\..\tests\include\test\drivers\signature.h" />
     <ClInclude Include="..\..\tests\include\test\drivers\size.h" />
+    <ClInclude Include="..\..\tests\include\test\drivers\test_driver.h" />
     <ClInclude Include="..\..\library\aesni.h" />
     <ClInclude Include="..\..\library\bn_mul.h" />
     <ClInclude Include="..\..\library\check_crypto_config.h" />
@@ -376,7 +376,6 @@
     <ClCompile Include="..\..\tests\src\random.c" />
     <ClCompile Include="..\..\tests\src\threading_helpers.c" />
     <ClCompile Include="..\..\tests\src\drivers\hash.c" />
-    <ClCompile Include="..\..\tests\src\drivers\key_management.c" />
     <ClCompile Include="..\..\tests\src\drivers\platform_builtin_keys.c" />
     <ClCompile Include="..\..\tests\src\drivers\test_driver_aead.c" />
     <ClCompile Include="..\..\tests\src\drivers\test_driver_cipher.c" />