mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-11-04 09:44:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: remove BUSTED_PRG dead code (#23340)

Browse Source 
BUSTED_PRG is no longer used by RunTests.cmake.
This commit is contained in:
zeertzjq
2023-04-27 14:36:37 +08:00
committed by GitHub
parent 39771b2238
commit d1bb9bffd5
1 changed files with 57 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
test/CMakeLists.txt
View File

@@ -5,84 +5,74 @@ if(NOT BUSTED_OUTPUT_TYPE)
set(BUSTED_OUTPUT_TYPE "nvim") set(BUSTED_OUTPUT_TYPE "nvim")
endif() endif()
find_program(BUSTED_PRG NAMES busted busted.bat) get_target_property(TEST_INCLUDE_DIRS main_lib INTERFACE_INCLUDE_DIRECTORIES)
if(BUSTED_PRG)
get_target_property(TEST_INCLUDE_DIRS main_lib INTERFACE_INCLUDE_DIRECTORIES)
set(UNITTEST_PREREQS nvim) set(UNITTEST_PREREQS nvim)
set(FUNCTIONALTEST_PREREQS nvim printenv-test printargs-test shell-test pwsh-test streams-test tty-test ${GENERATED_HELP_TAGS}) set(FUNCTIONALTEST_PREREQS nvim printenv-test printargs-test shell-test pwsh-test streams-test tty-test ${GENERATED_HELP_TAGS})
set(BENCHMARK_PREREQS nvim tty-test) set(BENCHMARK_PREREQS nvim tty-test)
check_lua_module(${LUA_PRG} "ffi" LUA_HAS_FFI) check_lua_module(${LUA_PRG} "ffi" LUA_HAS_FFI)
if(LUA_HAS_FFI) if(LUA_HAS_FFI)
add_custom_target(unittest add_custom_target(unittest
COMMAND ${CMAKE_COMMAND}
-D BUSTED_PRG=${BUSTED_PRG}
-D NVIM_PRG=$<TARGET_FILE:nvim>
-D WORKING_DIR=${PROJECT_SOURCE_DIR}
-D BUSTED_OUTPUT_TYPE=${BUSTED_OUTPUT_TYPE}
-D TEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}
-D BUILD_DIR=${CMAKE_BINARY_DIR}
-D TEST_TYPE=unit
-D CIRRUS_CI=$ENV{CIRRUS_CI}
-D CI_BUILD=${CI_BUILD}
-P ${PROJECT_SOURCE_DIR}/cmake/RunTests.cmake
DEPENDS ${UNITTEST_PREREQS}
USES_TERMINAL)
else()
message(WARNING "disabling unit tests: no Luajit FFI in ${LUA_PRG}")
endif()
configure_file(
${CMAKE_SOURCE_DIR}/test/cmakeconfig/paths.lua.in
${CMAKE_BINARY_DIR}/test/cmakeconfig/paths.lua)
add_custom_target(functionaltest
COMMAND ${CMAKE_COMMAND} COMMAND ${CMAKE_COMMAND}
-D BUSTED_PRG=${BUSTED_PRG}
-D NVIM_PRG=$<TARGET_FILE:nvim> -D NVIM_PRG=$<TARGET_FILE:nvim>
-D WORKING_DIR=${PROJECT_SOURCE_DIR} -D WORKING_DIR=${PROJECT_SOURCE_DIR}
-D BUSTED_OUTPUT_TYPE=${BUSTED_OUTPUT_TYPE} -D BUSTED_OUTPUT_TYPE=${BUSTED_OUTPUT_TYPE}
-D TEST_DIR=${CMAKE_CURRENT_SOURCE_DIR} -D TEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}
-D BUILD_DIR=${CMAKE_BINARY_DIR} -D BUILD_DIR=${CMAKE_BINARY_DIR}
-D DEPS_PREFIX=${DEPS_PREFIX} -D TEST_TYPE=unit
-D TEST_TYPE=functional
-D CIRRUS_CI=$ENV{CIRRUS_CI} -D CIRRUS_CI=$ENV{CIRRUS_CI}
-D CI_BUILD=${CI_BUILD} -D CI_BUILD=${CI_BUILD}
-P ${PROJECT_SOURCE_DIR}/cmake/RunTests.cmake -P ${PROJECT_SOURCE_DIR}/cmake/RunTests.cmake
DEPENDS ${FUNCTIONALTEST_PREREQS} DEPENDS ${UNITTEST_PREREQS}
USES_TERMINAL)
add_custom_target(benchmark
COMMAND ${CMAKE_COMMAND}
-D BUSTED_PRG=${BUSTED_PRG}
-D NVIM_PRG=$<TARGET_FILE:nvim>
-D WORKING_DIR=${PROJECT_SOURCE_DIR}
-D BUSTED_OUTPUT_TYPE=${BUSTED_OUTPUT_TYPE}
-D TEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}
-D BUILD_DIR=${CMAKE_BINARY_DIR}
-D TEST_TYPE=benchmark
-D CIRRUS_CI=$ENV{CIRRUS_CI}
-D CI_BUILD=${CI_BUILD}
-P ${PROJECT_SOURCE_DIR}/cmake/RunTests.cmake
DEPENDS ${BENCHMARK_PREREQS}
USES_TERMINAL) USES_TERMINAL)
else()
message(WARNING "disabling unit tests: no Luajit FFI in ${LUA_PRG}")
endif() endif()
find_program(BUSTED_LUA_PRG busted-lua) configure_file(
if(BUSTED_LUA_PRG) ${CMAKE_SOURCE_DIR}/test/cmakeconfig/paths.lua.in
add_custom_target(functionaltest-lua ${CMAKE_BINARY_DIR}/test/cmakeconfig/paths.lua)
COMMAND ${CMAKE_COMMAND}
-D BUSTED_PRG=${BUSTED_LUA_PRG} add_custom_target(functionaltest
-D NVIM_PRG=$<TARGET_FILE:nvim> COMMAND ${CMAKE_COMMAND}
-D WORKING_DIR=${PROJECT_SOURCE_DIR} -D NVIM_PRG=$<TARGET_FILE:nvim>
-D BUSTED_OUTPUT_TYPE=${BUSTED_OUTPUT_TYPE} -D WORKING_DIR=${PROJECT_SOURCE_DIR}
-D TEST_DIR=${CMAKE_CURRENT_SOURCE_DIR} -D BUSTED_OUTPUT_TYPE=${BUSTED_OUTPUT_TYPE}
-D BUILD_DIR=${CMAKE_BINARY_DIR} -D TEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}
-D TEST_TYPE=functional -D BUILD_DIR=${CMAKE_BINARY_DIR}
-D CIRRUS_CI=$ENV{CIRRUS_CI} -D DEPS_PREFIX=${DEPS_PREFIX}
-D CI_BUILD=${CI_BUILD} -D TEST_TYPE=functional
-P ${PROJECT_SOURCE_DIR}/cmake/RunTests.cmake -D CIRRUS_CI=$ENV{CIRRUS_CI}
DEPENDS ${FUNCTIONALTEST_PREREQS} -D CI_BUILD=${CI_BUILD}
USES_TERMINAL) -P ${PROJECT_SOURCE_DIR}/cmake/RunTests.cmake
endif() DEPENDS ${FUNCTIONALTEST_PREREQS}
USES_TERMINAL)
add_custom_target(benchmark
COMMAND ${CMAKE_COMMAND}
-D NVIM_PRG=$<TARGET_FILE:nvim>
-D WORKING_DIR=${PROJECT_SOURCE_DIR}
-D BUSTED_OUTPUT_TYPE=${BUSTED_OUTPUT_TYPE}
-D TEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}
-D BUILD_DIR=${CMAKE_BINARY_DIR}
-D TEST_TYPE=benchmark
-D CIRRUS_CI=$ENV{CIRRUS_CI}
-D CI_BUILD=${CI_BUILD}
-P ${PROJECT_SOURCE_DIR}/cmake/RunTests.cmake
DEPENDS ${BENCHMARK_PREREQS}
USES_TERMINAL)
add_custom_target(functionaltest-lua
COMMAND ${CMAKE_COMMAND}
-D NVIM_PRG=$<TARGET_FILE:nvim>
-D WORKING_DIR=${PROJECT_SOURCE_DIR}
-D BUSTED_OUTPUT_TYPE=${BUSTED_OUTPUT_TYPE}
-D TEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}
-D BUILD_DIR=${CMAKE_BINARY_DIR}
-D TEST_TYPE=functional
-D CIRRUS_CI=$ENV{CIRRUS_CI}
-D CI_BUILD=${CI_BUILD}
-P ${PROJECT_SOURCE_DIR}/cmake/RunTests.cmake
DEPENDS ${FUNCTIONALTEST_PREREQS}
USES_TERMINAL)