diff --git a/scripts/make_generated_files.bat b/scripts/make_generated_files.bat index 3e760c1c0e..cac84b54f9 100644 --- a/scripts/make_generated_files.bat +++ b/scripts/make_generated_files.bat @@ -28,4 +28,4 @@ python framework\scripts\generate_ecp_tests.py || exit /b 1 python framework\scripts\generate_psa_tests.py || 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 0f68e40e4d..1eb5e3b0be 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -170,9 +170,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 1fa3e9aee3..a1f9b900ee 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -58,9 +58,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 b3f9048eb1..b4800005f0 100755 --- a/tests/scripts/check-generated-files.sh +++ b/tests/scripts/check-generated-files.sh @@ -141,7 +141,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