diff options
| author | John Szakmeister <john@szakmeister.net> | 2014-11-05 09:33:03 -0500 |
|---|---|---|
| committer | John Szakmeister <john@szakmeister.net> | 2014-11-05 09:33:03 -0500 |
| commit | 3972715ce791466c1ea3c873f78e95e13eba6e58 (patch) | |
| tree | 91c7fb37fce7adb4af166e7ae6ee75c7b703bffa | |
| parent | e0628dab497fbfa62f0ab2dcc3d7eb785b5cc137 (diff) | |
| parent | afa5831d73f9f82af5dac3ef4948e801e17fc41f (diff) | |
| download | rneovim-3972715ce791466c1ea3c873f78e95e13eba6e58.tar.gz rneovim-3972715ce791466c1ea3c873f78e95e13eba6e58.tar.bz2 rneovim-3972715ce791466c1ea3c873f78e95e13eba6e58.zip | |
Merge pull request #1397 from fwalch/fix-test_file
Restore TEST_FILE functionality for running individual tests.
| -rw-r--r-- | cmake/RunTests.cmake | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/cmake/RunTests.cmake b/cmake/RunTests.cmake index b926e31994..9a3e8c296e 100644 --- a/cmake/RunTests.cmake +++ b/cmake/RunTests.cmake @@ -1,27 +1,22 @@ get_filename_component(BUSTED_DIR ${BUSTED_PRG} PATH) set(ENV{PATH} "${BUSTED_DIR}:$ENV{PATH}") + if(NVIM_PRG) set(ENV{NVIM_PROG} "${NVIM_PRG}") endif() if(DEFINED ENV{TEST_FILE}) - set(TEST_DIR $ENV{TEST_FILE}) -endif() - -if(TEST_TYPE STREQUAL "functional") - execute_process( - COMMAND ${BUSTED_PRG} -v -o ${BUSTED_OUTPUT_TYPE} - --lpath=${BUILD_DIR}/?.lua ${TEST_DIR}/functional - WORKING_DIRECTORY ${WORKING_DIR} - RESULT_VARIABLE res) + set(TEST_PATH "$ENV{TEST_FILE}") else() - execute_process( - COMMAND ${BUSTED_PRG} -v -o ${BUSTED_OUTPUT_TYPE} - --lpath=${BUILD_DIR}/?.lua ${TEST_DIR}/unit - WORKING_DIRECTORY ${WORKING_DIR} - RESULT_VARIABLE res) + set(TEST_PATH "${TEST_DIR}/${TEST_TYPE}") endif() +execute_process( + COMMAND ${BUSTED_PRG} -v -o ${BUSTED_OUTPUT_TYPE} + --lpath=${BUILD_DIR}/?.lua ${TEST_PATH} + WORKING_DIRECTORY ${WORKING_DIR} + RESULT_VARIABLE res) + if(NOT res EQUAL 0) - message(FATAL_ERROR "Unit tests failed.") + message(FATAL_ERROR "Running ${TEST_TYPE} tests failed.") endif() |