diff options
| -rw-r--r-- | cmake/RunTests.cmake | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/cmake/RunTests.cmake b/cmake/RunTests.cmake index 05c429c1f5..0282d1c738 100644 --- a/cmake/RunTests.cmake +++ b/cmake/RunTests.cmake @@ -2,12 +2,12 @@ set(ENV{LC_ALL} "en_US.UTF-8") set(ENV{VIMRUNTIME} ${WORKING_DIR}/runtime) -set(ENV{NVIM_RPLUGIN_MANIFEST} ${WORKING_DIR}/Xtest_rplugin_manifest) -set(ENV{XDG_CONFIG_HOME} ${WORKING_DIR}/Xtest_xdg/config) -set(ENV{XDG_DATA_HOME} ${WORKING_DIR}/Xtest_xdg/share) +set(ENV{NVIM_RPLUGIN_MANIFEST} ${BUILD_DIR}/Xtest_rplugin_manifest) +set(ENV{XDG_CONFIG_HOME} ${BUILD_DIR}/Xtest_xdg/config) +set(ENV{XDG_DATA_HOME} ${BUILD_DIR}/Xtest_xdg/share) if(NOT DEFINED ENV{NVIM_LOG_FILE}) - set(ENV{NVIM_LOG_FILE} ${WORKING_DIR}/.nvimlog) + set(ENV{NVIM_LOG_FILE} ${BUILD_DIR}/.nvimlog) endif() if(NVIM_PRG) @@ -16,40 +16,47 @@ endif() if(DEFINED ENV{TEST_FILE}) set(TEST_PATH "$ENV{TEST_FILE}") + set(rel_test_path "${TEST_PATH}") else() set(TEST_PATH "${TEST_DIR}/${TEST_TYPE}") + file(RELATIVE_PATH rel_test_path "${TEST_DIR}" "${TEST_PATH}") endif() if(BUSTED_OUTPUT_TYPE STREQUAL junit) set(EXTRA_ARGS OUTPUT_FILE ${BUILD_DIR}/${TEST_TYPE}test-junit.xml) endif() +set(BUSTED_ARGS $ENV{BUSTED_ARGS}) +separate_arguments(BUSTED_ARGS) + if(DEFINED ENV{TEST_TAG} AND NOT "$ENV{TEST_TAG}" STREQUAL "") - set(TEST_TAG "--tags=$ENV{TEST_TAG}") + list(APPEND BUSTED_ARGS --tags="$ENV{TEST_TAG}") endif() if(DEFINED ENV{TEST_FILTER} AND NOT "$ENV{TEST_FILTER}" STREQUAL "") - set(TEST_FILTER "--filter=$ENV{TEST_FILTER}") + list(APPEND BUSTED_ARGS --filter="$ENV{TEST_FILTER}") endif() -execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${WORKING_DIR}/Xtest-tmpdir) -set(ENV{TMPDIR} ${WORKING_DIR}/Xtest-tmpdir) +# TMPDIR: use relative test path (for parallel test runs / isolation). +set(ENV{TMPDIR} "${BUILD_DIR}/Xtest_tmpdir/${rel_test_path}") +execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory $ENV{TMPDIR}) + set(ENV{SYSTEM_NAME} ${SYSTEM_NAME}) execute_process( - COMMAND ${BUSTED_PRG} ${TEST_TAG} ${TEST_FILTER} -v -o ${BUSTED_OUTPUT_TYPE} + COMMAND ${BUSTED_PRG} -v -o ${BUSTED_OUTPUT_TYPE} --lua=${LUA_PRG} --lazy --helper=${TEST_DIR}/${TEST_TYPE}/preload.lua --lpath=${BUILD_DIR}/?.lua --lpath=${WORKING_DIR}/runtime/lua/?.lua --lpath=?.lua + ${BUSTED_ARGS} ${TEST_PATH} WORKING_DIRECTORY ${WORKING_DIR} ERROR_VARIABLE err RESULT_VARIABLE res ${EXTRA_ARGS}) -file(REMOVE ${WORKING_DIR}/Xtest_rplugin_manifest) -file(REMOVE_RECURSE ${WORKING_DIR}/Xtest_xdg) -file(REMOVE_RECURSE ${WORKING_DIR}/Xtest-tmpdir) +file(GLOB RM_FILES ${BUILD_DIR}/Xtest_*) +file(REMOVE_RECURSE ${RM_FILES}) if(NOT res EQUAL 0) message(STATUS "Output to stderr:\n${err}") |