From b74c3eaf87e1f4a750c19f2de42cf8c55aacab13 Mon Sep 17 00:00:00 2001 From: Elena Uziunaite Date: Tue, 8 Oct 2024 13:02:48 +0100 Subject: [PATCH] Adjust file path for generate_tls13_compat_tests.py Signed-off-by: Elena Uziunaite --- scripts/make_generated_files.bat | 2 +- tests/CMakeLists.txt | 4 ++-- tests/Makefile | 4 ++-- tests/scripts/check-generated-files.sh | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/make_generated_files.bat b/scripts/make_generated_files.bat index 77a5166c17..735cc7dc7d 100644 --- a/scripts/make_generated_files.bat +++ b/scripts/make_generated_files.bat @@ -29,4 +29,4 @@ python framework\scripts\generate_ecp_tests.py --directory tf-psa-crypto\tests\s python framework\scripts\generate_psa_tests.py --directory tf-psa-crypto\tests\suites || exit /b 1 python framework\scripts\generate_test_keys.py --output tests\src\test_keys.h || exit /b 1 python framework\scripts\generate_test_cert_macros.py --output tests\src\test_certs.h || exit /b 1 -python tests\scripts\generate_tls13_compat_tests.py || exit /b 1 +python framework\scripts\generate_tls13_compat_tests.py || exit /b 1 diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 5b6850376c..4e90bffb3a 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -71,9 +71,9 @@ if(GEN_FILES) ${CMAKE_CURRENT_SOURCE_DIR}/.. COMMAND "${MBEDTLS_PYTHON_EXECUTABLE}" - "${CMAKE_CURRENT_SOURCE_DIR}/scripts/generate_tls13_compat_tests.py" + "${CMAKE_CURRENT_SOURCE_DIR}/../framework/scripts/generate_tls13_compat_tests.py" DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/scripts/generate_tls13_compat_tests.py + ${CMAKE_CURRENT_SOURCE_DIR}/../framework/scripts/generate_tls13_compat_tests.py ) add_custom_target(tls13-compat.sh DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/opt-testcases/tls13-compat.sh) diff --git a/tests/Makefile b/tests/Makefile index 66bb1cd130..c6d8e2ccc3 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -62,9 +62,9 @@ GENERATED_FILES += src/test_keys.h src/test_certs.h # Generated files needed to (fully) run ssl-opt.sh .PHONY: ssl-opt -opt-testcases/tls13-compat.sh: scripts/generate_tls13_compat_tests.py +opt-testcases/tls13-compat.sh: ../framework/scripts/generate_tls13_compat_tests.py echo " Gen $@" - $(PYTHON) scripts/generate_tls13_compat_tests.py -o $@ + $(PYTHON) ../framework/scripts/generate_tls13_compat_tests.py -o $@ GENERATED_FILES += opt-testcases/tls13-compat.sh ssl-opt: opt-testcases/tls13-compat.sh diff --git a/tests/scripts/check-generated-files.sh b/tests/scripts/check-generated-files.sh index 0f05dff122..583c26e8de 100755 --- a/tests/scripts/check-generated-files.sh +++ b/tests/scripts/check-generated-files.sh @@ -174,7 +174,7 @@ if in_mbedtls_repo; then check scripts/generate_query_config.pl programs/test/query_config.c check scripts/generate_features.pl library/version_features.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_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 # care about their content, but the files must exist. So it must run after