From 2cca9b8f13c092013068001ce2dba2d88683fbb5 Mon Sep 17 00:00:00 2001
From: Steven Cooreman <steven.cooreman@silabs.com>
Date: Thu, 8 Apr 2021 12:34:02 +0200
Subject: [PATCH] Rename test driver source files to avoid file name conflicts

MSVC doesn't like multiple compilation units with the same name.
(conflict between cipher.c in the library and in the test driver folder)

Signed-off-by: Steven Cooreman <steven.cooreman@silabs.com>
---
 tests/src/drivers/{aead.c => test_driver_aead.c}       |  0
 tests/src/drivers/{cipher.c => test_driver_cipher.c}   |  0
 .../{key_management.c => test_driver_key_management.c} |  0
 .../drivers/{signature.c => test_driver_signature.c}   |  0
 tests/src/drivers/{size.c => test_driver_size.c}       |  0
 visualc/VS2010/mbedTLS.vcxproj                         | 10 +++++-----
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename tests/src/drivers/{aead.c => test_driver_aead.c} (100%)
 rename tests/src/drivers/{cipher.c => test_driver_cipher.c} (100%)
 rename tests/src/drivers/{key_management.c => test_driver_key_management.c} (100%)
 rename tests/src/drivers/{signature.c => test_driver_signature.c} (100%)
 rename tests/src/drivers/{size.c => test_driver_size.c} (100%)

diff --git a/tests/src/drivers/aead.c b/tests/src/drivers/test_driver_aead.c
similarity index 100%
rename from tests/src/drivers/aead.c
rename to tests/src/drivers/test_driver_aead.c
diff --git a/tests/src/drivers/cipher.c b/tests/src/drivers/test_driver_cipher.c
similarity index 100%
rename from tests/src/drivers/cipher.c
rename to tests/src/drivers/test_driver_cipher.c
diff --git a/tests/src/drivers/key_management.c b/tests/src/drivers/test_driver_key_management.c
similarity index 100%
rename from tests/src/drivers/key_management.c
rename to tests/src/drivers/test_driver_key_management.c
diff --git a/tests/src/drivers/signature.c b/tests/src/drivers/test_driver_signature.c
similarity index 100%
rename from tests/src/drivers/signature.c
rename to tests/src/drivers/test_driver_signature.c
diff --git a/tests/src/drivers/size.c b/tests/src/drivers/test_driver_size.c
similarity index 100%
rename from tests/src/drivers/size.c
rename to tests/src/drivers/test_driver_size.c
diff --git a/visualc/VS2010/mbedTLS.vcxproj b/visualc/VS2010/mbedTLS.vcxproj
index 70ea6c5bc6..5277193f91 100644
--- a/visualc/VS2010/mbedTLS.vcxproj
+++ b/visualc/VS2010/mbedTLS.vcxproj
@@ -379,12 +379,12 @@
     <ClCompile Include="..\..\tests\src\psa_exercise_key.c" />
     <ClCompile Include="..\..\tests\src\random.c" />
     <ClCompile Include="..\..\tests\src\threading_helpers.c" />
-    <ClCompile Include="..\..\tests\src\drivers\aead.c" />
-    <ClCompile Include="..\..\tests\src\drivers\cipher.c" />
-    <ClCompile Include="..\..\tests\src\drivers\key_management.c" />
     <ClCompile Include="..\..\tests\src\drivers\platform_builtin_keys.c" />
-    <ClCompile Include="..\..\tests\src\drivers\signature.c" />
-    <ClCompile Include="..\..\tests\src\drivers\size.c" />
+    <ClCompile Include="..\..\tests\src\drivers\test_driver_aead.c" />
+    <ClCompile Include="..\..\tests\src\drivers\test_driver_cipher.c" />
+    <ClCompile Include="..\..\tests\src\drivers\test_driver_key_management.c" />
+    <ClCompile Include="..\..\tests\src\drivers\test_driver_signature.c" />
+    <ClCompile Include="..\..\tests\src\drivers\test_driver_size.c" />
     <ClCompile Include="..\..\3rdparty\everest\library\everest.c" />
     <ClCompile Include="..\..\3rdparty\everest\library\Hacl_Curve25519_joined.c" />
     <ClCompile Include="..\..\3rdparty\everest\library\x25519.c" />