Changed test driver include folder to reflect it's a test driver Signed-off-by: Steven Cooreman <steven.cooreman@silabs.com>
diff --git a/library/psa_crypto_driver_wrappers.c b/library/psa_crypto_driver_wrappers.c index 56bb003..cc51e24 100644 --- a/library/psa_crypto_driver_wrappers.c +++ b/library/psa_crypto_driver_wrappers.c
@@ -33,7 +33,7 @@ #ifndef PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT #define PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT #endif -#include "drivers/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/scripts/generate_visualc_files.pl b/scripts/generate_visualc_files.pl index 4695955..6c2b5e4 100755 --- a/scripts/generate_visualc_files.pl +++ b/scripts/generate_visualc_files.pl
@@ -39,7 +39,7 @@ my $source_dir = 'library'; my $test_source_dir = 'tests/src'; my $test_header_dir = 'tests/include/test'; -my $test_drivers_header_dir = 'tests/include/drivers'; +my $test_drivers_header_dir = 'tests/include/test/drivers'; my @thirdparty_header_dirs = qw( 3rdparty/everest/include/everest
diff --git a/tests/include/drivers/keygen.h b/tests/include/test/drivers/keygen.h similarity index 100% rename from tests/include/drivers/keygen.h rename to tests/include/test/drivers/keygen.h
diff --git a/tests/include/drivers/signature.h b/tests/include/test/drivers/signature.h similarity index 100% rename from tests/include/drivers/signature.h rename to tests/include/test/drivers/signature.h
diff --git a/tests/include/drivers/test_driver.h b/tests/include/test/drivers/test_driver.h similarity index 92% rename from tests/include/drivers/test_driver.h rename to tests/include/test/drivers/test_driver.h index 98dded8..75135e0 100644 --- a/tests/include/drivers/test_driver.h +++ b/tests/include/test/drivers/test_driver.h
@@ -22,7 +22,7 @@ #define PSA_CRYPTO_TEST_DRIVER_LIFETIME 0x7fffff -#include "drivers/signature.h" -#include "drivers/keygen.h" +#include "test/drivers/signature.h" +#include "test/drivers/keygen.h" #endif /* PSA_CRYPTO_TEST_DRIVER_H */
diff --git a/tests/src/drivers/keygen.c b/tests/src/drivers/keygen.c index d493ab3..f15a4bc 100644 --- a/tests/src/drivers/keygen.c +++ b/tests/src/drivers/keygen.c
@@ -30,7 +30,7 @@ #include "mbedtls/ecp.h" #include "mbedtls/error.h" -#include "drivers/keygen.h" +#include "test/drivers/keygen.h" #include "test/random.h"
diff --git a/tests/src/drivers/signature.c b/tests/src/drivers/signature.c index 5299a96..028d24a 100644 --- a/tests/src/drivers/signature.c +++ b/tests/src/drivers/signature.c
@@ -30,7 +30,7 @@ #include "psa_crypto_core.h" #include "mbedtls/ecp.h" -#include "drivers/signature.h" +#include "test/drivers/signature.h" #include "mbedtls/md.h" #include "mbedtls/ecdsa.h"
diff --git a/tests/suites/test_suite_psa_crypto_driver_wrappers.function b/tests/suites/test_suite_psa_crypto_driver_wrappers.function index c3830a7..9177982 100644 --- a/tests/suites/test_suite_psa_crypto_driver_wrappers.function +++ b/tests/suites/test_suite_psa_crypto_driver_wrappers.function
@@ -1,7 +1,7 @@ /* BEGIN_HEADER */ #include "test/psa_crypto_helpers.h" -#include "drivers/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 8371eda..9d79298 100644 --- a/visualc/VS2010/mbedTLS.vcxproj +++ b/visualc/VS2010/mbedTLS.vcxproj
@@ -238,9 +238,9 @@ <ClInclude Include="..\..\tests\include\test\psa_crypto_helpers.h" /> <ClInclude Include="..\..\tests\include\test\psa_helpers.h" /> <ClInclude Include="..\..\tests\include\test\random.h" /> - <ClInclude Include="..\..\tests\include\drivers\keygen.h" /> - <ClInclude Include="..\..\tests\include\drivers\signature.h" /> - <ClInclude Include="..\..\tests\include\drivers\test_driver.h" /> + <ClInclude Include="..\..\tests\include\test\drivers\keygen.h" /> + <ClInclude Include="..\..\tests\include\test\drivers\signature.h" /> + <ClInclude Include="..\..\tests\include\test\drivers\test_driver.h" /> <ClInclude Include="..\..\library\common.h" /> <ClInclude Include="..\..\library\psa_crypto_core.h" /> <ClInclude Include="..\..\library\psa_crypto_driver_wrappers.h" />