Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-28 05:43:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove cmake test_prep target

Browse source 
This is now carried out more cleanly and more correctly by
test_driver.sh
This commit is contained in:
Mahmoud Al-Qudsi 2021-03-17 21:32:17 -05:00 committed by Johannes Altmanninger
parent 35975d83af
commit 7bcf527f84
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cmake/Install.cmake
View file

@ -176,7 +176,8 @@ install(FILES fish.png DESTINATION ${rel_datadir}/pixmaps)
# Group install targets into a InstallTargets folder # Group install targets into a InstallTargets folder
set_property(TARGET build_fish_pc CHECK-FISH-BUILD-VERSION-FILE set_property(TARGET build_fish_pc CHECK-FISH-BUILD-VERSION-FILE
# test_fishscript # test_fishscript
test_prep tests_buildroot_target # test_prep
tests_buildroot_target
PROPERTY FOLDER cmake/InstallTargets) PROPERTY FOLDER cmake/InstallTargets)
# Make a target build_root that installs into the buildroot directory, for testing. # Make a target build_root that installs into the buildroot directory, for testing.

6
cmake/Tests.cmake
View file

@ -115,8 +115,8 @@ foreach(LTEST ${LOW_LEVEL_TESTS})
) )
endforeach(LTEST) endforeach(LTEST)
add_test(test_prep add_test(tests_buildroot_target
"${CMAKE_COMMAND}" --build ${CMAKE_BINARY_DIR} --target test_prep) "${CMAKE_COMMAND}" --build ${CMAKE_BINARY_DIR} --target tests_buildroot_target)
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)
@ -127,5 +127,5 @@ foreach(CHECK ${FISH_CHECKS})
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests
) )
set_tests_properties(${LTEST} PROPERTIES DEPENDS test_prep) set_tests_properties(${LTEST} PROPERTIES DEPENDS tests_buildroot_target)
endforeach(CHECK) endforeach(CHECK)