AuroraMiddleware/mbedtls
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "tests: Add a crypto prefix to submodule tests"

Browse Source 
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:
Gilles Peskine 2020-02-26 19:42:43 +01:00 committed by Ronald Cron
parent 6bbe783908
commit b85b20dfdc
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/CMakeLists.txt
View File

@ -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 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}) include_directories(${CMAKE_CURRENT_SOURCE_DIR})
add_executable(${exe_name} test_suite_${data_name}.c) add_executable(test_suite_${data_name} test_suite_${data_name}.c)
target_link_libraries(${exe_name} ${libs}) target_link_libraries(test_suite_${data_name} ${libs})
target_include_directories(${exe_name} target_include_directories(test_suite_${data_name}
PUBLIC ${MBEDTLS_DIR}/include/ PUBLIC ${CMAKE_SOURCE_DIR}/include/
PUBLIC ${MBEDTLS_DIR}/crypto/include/ PUBLIC ${CMAKE_SOURCE_DIR}/crypto/include/
PUBLIC ${MBEDTLS_DIR}/crypto/library/) PUBLIC ${CMAKE_SOURCE_DIR}/crypto/library/)
if(${data_name} MATCHES ${SKIP_TEST_SUITES_REGEX}) if(${data_name} MATCHES ${SKIP_TEST_SUITES_REGEX})
message(STATUS "The test suite ${data_name} will not be executed.") message(STATUS "The test suite ${data_name} will not be executed.")
else() else()
add_test(${data_name}-suite ${exe_name} --verbose) add_test(${data_name}-suite test_suite_${data_name} --verbose)
endif() endif()
endfunction(add_test_suite) endfunction(add_test_suite)