From 09fee364a31b33bf261d0cafc17e694e211e9d20 Mon Sep 17 00:00:00 2001 From: Elena Uziunaite Date: Mon, 7 Oct 2024 17:40:21 +0100 Subject: [PATCH] Adjust file path for generate_ssl_debug_helpers.py Signed-off-by: Elena Uziunaite --- library/CMakeLists.txt | 4 ++-- library/Makefile | 4 ++-- scripts/make_generated_files.bat | 2 +- tests/scripts/check-generated-files.sh | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index ca48a756b9..5cb5ec860f 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -61,11 +61,11 @@ if(GEN_FILES) ${CMAKE_CURRENT_BINARY_DIR}/ssl_debug_helpers_generated.c COMMAND ${MBEDTLS_PYTHON_EXECUTABLE} - ${CMAKE_CURRENT_SOURCE_DIR}/../scripts/generate_ssl_debug_helpers.py + ${CMAKE_CURRENT_SOURCE_DIR}/../framework/scripts/generate_ssl_debug_helpers.py --mbedtls-root ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_BINARY_DIR} DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../scripts/generate_ssl_debug_helpers.py + ${CMAKE_CURRENT_SOURCE_DIR}/../framework/scripts/generate_ssl_debug_helpers.py ${tls_error_headers} ) else() diff --git a/library/Makefile b/library/Makefile index 9490aa78de..e9c908ee9c 100644 --- a/library/Makefile +++ b/library/Makefile @@ -364,11 +364,11 @@ $(TF_PSA_CRYPTO_DRIVERS_BUILTIN_SRC_PATH)/error.c: echo " Gen $@" $(PERL) ../scripts/generate_errors.pl -ssl_debug_helpers_generated.c: $(gen_file_dep) ../scripts/generate_ssl_debug_helpers.py +ssl_debug_helpers_generated.c: $(gen_file_dep) ../framework/scripts/generate_ssl_debug_helpers.py ssl_debug_helpers_generated.c: $(gen_file_dep) $(filter-out %config%,$(wildcard ../include/mbedtls/*.h)) ssl_debug_helpers_generated.c: echo " Gen $@" - $(PYTHON) ../scripts/generate_ssl_debug_helpers.py --mbedtls-root .. . + $(PYTHON) ../framework/scripts/generate_ssl_debug_helpers.py --mbedtls-root .. . version_features.c: $(gen_file_dep) ../scripts/generate_features.pl version_features.c: $(gen_file_dep) ../scripts/data_files/version_features.fmt diff --git a/scripts/make_generated_files.bat b/scripts/make_generated_files.bat index ba1a49783c..77a5166c17 100644 --- a/scripts/make_generated_files.bat +++ b/scripts/make_generated_files.bat @@ -13,7 +13,7 @@ python scripts\generate_driver_wrappers.py || exit /b 1 perl scripts\generate_errors.pl || exit /b 1 perl scripts\generate_query_config.pl || exit /b 1 perl scripts\generate_features.pl || exit /b 1 -python scripts\generate_ssl_debug_helpers.py || exit /b 1 +python framework\scripts\generate_ssl_debug_helpers.py || exit /b 1 @rem @@@@ Build @@@@ perl scripts\generate_visualc_files.pl || exit /b 1 diff --git a/tests/scripts/check-generated-files.sh b/tests/scripts/check-generated-files.sh index 2a112075fa..0f05dff122 100755 --- a/tests/scripts/check-generated-files.sh +++ b/tests/scripts/check-generated-files.sh @@ -173,7 +173,7 @@ if in_mbedtls_repo; then check scripts/generate_errors.pl ${builtin_drivers_dir}/error.c check scripts/generate_query_config.pl programs/test/query_config.c check scripts/generate_features.pl library/version_features.c - check scripts/generate_ssl_debug_helpers.py library/ssl_debug_helpers_generated.c + check framework/scripts/generate_ssl_debug_helpers.py library/ssl_debug_helpers_generated.c check tests/scripts/generate_tls13_compat_tests.py tests/opt-testcases/tls13-compat.sh check framework/scripts/generate_test_cert_macros.py tests/src/test_certs.h # generate_visualc_files enumerates source files (library/*.c). It doesn't