From 10e58e7b05f5ef36e4f849ae3b6a4115139302e7 Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Thu, 19 Sep 2024 19:20:00 +0200 Subject: [PATCH] Move generation of tls13-compat.sh to tests/CMakeLists.txt Signed-off-by: Gilles Peskine --- CMakeLists.txt | 14 -------------- tests/CMakeLists.txt | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ec11e7e06..51944fad68 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -362,20 +362,6 @@ if(ENABLE_TESTING OR ENABLE_PROGRAMS) ) add_custom_target(test_certs_header DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/tests/src/test_certs.h) add_dependencies(mbedtls_test test_keys_header test_certs_header) - - add_custom_command( - OUTPUT - ${CMAKE_CURRENT_SOURCE_DIR}/tests/opt-testcases/tls13-compat.sh - WORKING_DIRECTORY - ${CMAKE_CURRENT_SOURCE_DIR} - COMMAND - "${MBEDTLS_PYTHON_EXECUTABLE}" - "${CMAKE_CURRENT_SOURCE_DIR}/tests/scripts/generate_tls13_compat_tests.py" - DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/framework/scripts/generate_test_keys.py - ) - add_custom_target(tls13-compat.sh - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/tests/opt-testcases/tls13-compat.sh) endif() target_include_directories(mbedtls_test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tests/include diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index b909c4ee14..3a38c325d0 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -163,6 +163,20 @@ if(GEN_FILES) ${CMAKE_CURRENT_SOURCE_DIR}/../include/psa/crypto_extra.h ) + add_custom_command( + OUTPUT + ${CMAKE_CURRENT_SOURCE_DIR}/opt-testcases/tls13-compat.sh + WORKING_DIRECTORY + ${CMAKE_CURRENT_SOURCE_DIR}/.. + COMMAND + "${MBEDTLS_PYTHON_EXECUTABLE}" + "${CMAKE_CURRENT_SOURCE_DIR}/scripts/generate_tls13_compat_tests.py" + DEPENDS + ${CMAKE_CURRENT_SOURCE_DIR}/../framework/scripts/generate_test_keys.py + ) + add_custom_target(tls13-compat.sh + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/opt-testcases/tls13-compat.sh) + else() foreach(file ${all_generated_data_files}) link_to_source(${file})