mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-11-22 16:35:41 +01:00
Revert "tests: Add a crypto prefix to submodule tests"
This reverts commit b478bb6ddb
.
Conflicts:
* tests/CMakeLists.txt: revert the introduction of exe_name, but keep
the addition of ${CMAKE_SOURCE_DIR}/crypto/library/ to
target_include_directories.
This commit is contained in:
parent
6bbe783908
commit
b85b20dfdc
@ -47,25 +47,18 @@ function(add_test_suite suite_name)
|
||||
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/scripts/generate_test_code.py mbedtls ${CMAKE_CURRENT_SOURCE_DIR}/suites/helpers.function ${CMAKE_CURRENT_SOURCE_DIR}/suites/main_test.function ${CMAKE_CURRENT_SOURCE_DIR}/suites/host_test.function ${CMAKE_CURRENT_SOURCE_DIR}/suites/test_suite_${suite_name}.function ${CMAKE_CURRENT_SOURCE_DIR}/suites/test_suite_${data_name}.data
|
||||
)
|
||||
|
||||
set(exe_name test_suite_${data_name})
|
||||
# Add a prefix to differentiate these tests from those of the parent
|
||||
# module, when this project is built as a submodule.
|
||||
if(USE_CRYPTO_SUBMODULE)
|
||||
set(exe_name crypto.${exe_name})
|
||||
endif()
|
||||
|
||||
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
|
||||
add_executable(${exe_name} test_suite_${data_name}.c)
|
||||
target_link_libraries(${exe_name} ${libs})
|
||||
target_include_directories(${exe_name}
|
||||
PUBLIC ${MBEDTLS_DIR}/include/
|
||||
PUBLIC ${MBEDTLS_DIR}/crypto/include/
|
||||
PUBLIC ${MBEDTLS_DIR}/crypto/library/)
|
||||
add_executable(test_suite_${data_name} test_suite_${data_name}.c)
|
||||
target_link_libraries(test_suite_${data_name} ${libs})
|
||||
target_include_directories(test_suite_${data_name}
|
||||
PUBLIC ${CMAKE_SOURCE_DIR}/include/
|
||||
PUBLIC ${CMAKE_SOURCE_DIR}/crypto/include/
|
||||
PUBLIC ${CMAKE_SOURCE_DIR}/crypto/library/)
|
||||
|
||||
if(${data_name} MATCHES ${SKIP_TEST_SUITES_REGEX})
|
||||
message(STATUS "The test suite ${data_name} will not be executed.")
|
||||
else()
|
||||
add_test(${data_name}-suite ${exe_name} --verbose)
|
||||
add_test(${data_name}-suite test_suite_${data_name} --verbose)
|
||||
endif()
|
||||
endfunction(add_test_suite)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user