diff options
| author | erw7 <erw7.github@gmail.com> | 2019-07-19 20:51:18 +0900 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2019-07-19 13:51:18 +0200 |
| commit | 6614543316e8a5483c8163b5d35f398f05e2f964 (patch) | |
| tree | f390856f0df41cc059ef249c25b26f73fb5a0850 | |
| parent | d4e93fedf13bce843aae4219fc9b5057394114ea (diff) | |
| download | rneovim-6614543316e8a5483c8163b5d35f398f05e2f964.tar.gz rneovim-6614543316e8a5483c8163b5d35f398f05e2f964.tar.bz2 rneovim-6614543316e8a5483c8163b5d35f398f05e2f964.zip | |
test: Force $TEST_FILE to relative path [ci skip] #10535
- Always force TEST_PATH to a relative path.
- Eliminate rel_test_path. (The code simplification is worth the extra
subdirectory below Xtest_tmpdir/.)
| -rw-r--r-- | cmake/RunTests.cmake | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/cmake/RunTests.cmake b/cmake/RunTests.cmake index 5406a07fc8..16ac22ced4 100644 --- a/cmake/RunTests.cmake +++ b/cmake/RunTests.cmake @@ -16,10 +16,13 @@ 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() + +# Force $TEST_PATH to workdir-relative path ("test/…"). +if(IS_ABSOLUTE ${TEST_PATH}) + file(RELATIVE_PATH TEST_PATH "${WORKING_DIR}" "${TEST_PATH}") endif() if(BUSTED_OUTPUT_TYPE STREQUAL junit) @@ -38,7 +41,7 @@ if(DEFINED ENV{TEST_FILTER} AND NOT "$ENV{TEST_FILTER}" STREQUAL "") endif() # TMPDIR: use relative test path (for parallel test runs / isolation). -set(ENV{TMPDIR} "${BUILD_DIR}/Xtest_tmpdir/${rel_test_path}") +set(ENV{TMPDIR} "${BUILD_DIR}/Xtest_tmpdir/${TEST_PATH}") execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory $ENV{TMPDIR}) set(ENV{SYSTEM_NAME} ${CMAKE_HOST_SYSTEM_NAME}) # used by test/helpers.lua. |