github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-02-12 15:45:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compile fish_test_helper in CMake again

Browse Source 
That means we don't have to recompile it for every test
This commit is contained in:
Fabian Boehm 2025-01-12 17:40:46 +01:00
parent aa77892be4
commit afb1cc21b6
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmake/Tests.cmake
View File

@ -98,6 +98,8 @@ function(add_test_target NAME)
DEPENDS tests_dir funcs_dir tests_buildroot_target USES_TERMINAL ) DEPENDS tests_dir funcs_dir tests_buildroot_target USES_TERMINAL )
endfunction() endfunction()
add_executable(fish_test_helper tests/fish_test_helper.c)
add_custom_target(tests_buildroot_target add_custom_target(tests_buildroot_target
# Make the directory in which to run tests: # Make the directory in which to run tests:
COMMAND ${CMAKE_COMMAND} -E make_directory ${TEST_INSTALL_DIR} COMMAND ${CMAKE_COMMAND} -E make_directory ${TEST_INSTALL_DIR}
@ -107,15 +109,14 @@ add_custom_target(tests_buildroot_target
COMMAND ${CMAKE_COMMAND} -E create_symlink COMMAND ${CMAKE_COMMAND} -E create_symlink
${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX} ${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}
${TEST_ROOT_DIR} ${TEST_ROOT_DIR}
DEPENDS fish) DEPENDS fish fish_test_helper)
FILE(GLOB FISH_CHECKS CONFIGURE_DEPENDS ${CMAKE_SOURCE_DIR}/tests/checks/*.fish) FILE(GLOB FISH_CHECKS CONFIGURE_DEPENDS ${CMAKE_SOURCE_DIR}/tests/checks/*.fish)
foreach(CHECK ${FISH_CHECKS}) foreach(CHECK ${FISH_CHECKS})
get_filename_component(CHECK_NAME ${CHECK} NAME) get_filename_component(CHECK_NAME ${CHECK} NAME)
get_filename_component(CHECK ${CHECK} NAME_WE) get_filename_component(CHECK ${CHECK} NAME_WE)
add_test(NAME ${CHECK_NAME} add_test(NAME ${CHECK_NAME}
# Don't use --cachedir here because that races when running these in parallel COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tests/test_driver.py --cachedir=${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tests/test_driver.py ${CMAKE_CURRENT_BINARY_DIR}
checks/${CHECK}.fish checks/${CHECK}.fish
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests
) )
@ -128,7 +129,7 @@ FILE(GLOB PEXPECTS CONFIGURE_DEPENDS ${CMAKE_SOURCE_DIR}/tests/pexpects/*.py)
foreach(PEXPECT ${PEXPECTS}) foreach(PEXPECT ${PEXPECTS})
get_filename_component(PEXPECT ${PEXPECT} NAME) get_filename_component(PEXPECT ${PEXPECT} NAME)
add_test(NAME ${PEXPECT} add_test(NAME ${PEXPECT}
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tests/test_driver.py ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tests/test_driver.py --cachedir=${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
pexpects/${PEXPECT} pexpects/${PEXPECT}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests
) )