diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-02-12 01:02:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-12 01:02:54 +0100 |
| commit | 30826cb2d621615264607fbd507f6f47e6f2011e (patch) | |
| tree | 38c1cefe5b6fe6b7932e5afcf895a75e4d16dbec /cmake | |
| parent | abdbfd26bc7f91cb6fda8feb758ffd020fb58754 (diff) | |
| download | rneovim-30826cb2d621615264607fbd507f6f47e6f2011e.tar.gz rneovim-30826cb2d621615264607fbd507f6f47e6f2011e.tar.bz2 rneovim-30826cb2d621615264607fbd507f6f47e6f2011e.zip | |
build: `oldtest` target: TEST_FILE, NVIM_PRG (#6098)
- Add support for TEST_FILE to the `oldtest` target, for consistency
with the busted/lua tests.
Caveat: with the busted/lua tests TEST_FILE takes a full path, whereas
for `oldtest` it must be "test_foo.res".
- Add support for NVIM_PRG, again so that all test-related targets are
consistent.
- Use consistent name for NVIM_PRG. But still need to support NVIM_PROG
for QuickBuild CI.
Note: The `oldtest` target is driven by the top-level Makefile, because
it requires a TTY. CMake 3.2 added a USES_TERMINAL flag to
add_custom_target(). But we support CMake 2.8...
add_custom_target(oldtest
COMMAND make clean
COMMAND make NVIM_PRG=$<TARGET_FILE:nvim> $ENV{MAKEOVERRIDES}
DEPENDS nvim
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src/nvim/testdir"
USES_TERMINAL true
)
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/RunTests.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/RunTests.cmake b/cmake/RunTests.cmake index 19aaf85d0f..38e0f35213 100644 --- a/cmake/RunTests.cmake +++ b/cmake/RunTests.cmake @@ -4,7 +4,7 @@ set(ENV{XDG_CONFIG_HOME} ${WORKING_DIR}/Xtest_xdg/config) set(ENV{XDG_DATA_HOME} ${WORKING_DIR}/Xtest_xdg/share) if(NVIM_PRG) - set(ENV{NVIM_PROG} "${NVIM_PRG}") + set(ENV{NVIM_PRG} "${NVIM_PRG}") endif() if(DEFINED ENV{TEST_FILE}) |