diff options
| author | John Szakmeister <john@szakmeister.net> | 2014-11-05 07:53:53 -0500 |
|---|---|---|
| committer | John Szakmeister <john@szakmeister.net> | 2014-11-05 07:53:53 -0500 |
| commit | e0628dab497fbfa62f0ab2dcc3d7eb785b5cc137 (patch) | |
| tree | 432a38e4be5fc338a090d98f9a5e97a4d057d148 | |
| parent | d1675de0a924695cb682e189728531f152e1dff8 (diff) | |
| parent | 5ba1d980fba06fe11964159ee4fcc00c1e59f817 (diff) | |
| download | rneovim-e0628dab497fbfa62f0ab2dcc3d7eb785b5cc137.tar.gz rneovim-e0628dab497fbfa62f0ab2dcc3d7eb785b5cc137.tar.bz2 rneovim-e0628dab497fbfa62f0ab2dcc3d7eb785b5cc137.zip | |
Merge pull request #1395 from jszakmeister/fix-run-functional-tests
build: fix running of functional tests directly with CMake
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | cmake/RunTests.cmake | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 632879c4a3..eb79a18747 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -252,6 +252,7 @@ if(BUSTED_PRG) add_custom_target(functionaltest COMMAND ${CMAKE_COMMAND} -DBUSTED_PRG=${BUSTED_PRG} + -DNVIM_PRG=$<TARGET_FILE:nvim> -DWORKING_DIR=${CMAKE_CURRENT_SOURCE_DIR} -DBUSTED_OUTPUT_TYPE=${BUSTED_OUTPUT_TYPE} -DTEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}/test diff --git a/cmake/RunTests.cmake b/cmake/RunTests.cmake index e2c548d7e6..b926e31994 100644 --- a/cmake/RunTests.cmake +++ b/cmake/RunTests.cmake @@ -1,5 +1,9 @@ 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() |