diff options
| -rw-r--r-- | cmake/RunTests.cmake | 4 | ||||
| -rw-r--r-- | test/helpers.lua | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/cmake/RunTests.cmake b/cmake/RunTests.cmake index bf5049c5f0..e07c6dd174 100644 --- a/cmake/RunTests.cmake +++ b/cmake/RunTests.cmake @@ -51,8 +51,8 @@ if(DEFINED ENV{TEST_FILTER_OUT} AND NOT "$ENV{TEST_FILTER_OUT}" STREQUAL "") list(APPEND BUSTED_ARGS --filter-out $ENV{TEST_FILTER_OUT}) endif() -# TMPDIR: use relative test path (for parallel test runs / isolation). -set(ENV{TMPDIR} "${BUILD_DIR}/Xtest_tmpdir/${TEST_PATH}") +# TMPDIR: for helpers.tmpname() and Nvim tempname(). +set(ENV{TMPDIR} "${BUILD_DIR}/Xtest_tmpdir") execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory $ENV{TMPDIR}) # HISTFILE: do not write into user's ~/.bash_history diff --git a/test/helpers.lua b/test/helpers.lua index a3482d1b46..a1c3dfacd2 100644 --- a/test/helpers.lua +++ b/test/helpers.lua @@ -291,7 +291,8 @@ module.tmpname = (function() if tmpdir_is_local(tmpdir) then -- Cannot control os.tmpname() dir, so hack our own tmpname() impl. seq = seq + 1 - local fname = tmpdir..'/nvim-test-lua-'..seq + -- "…/Xtest_tmpdir/T42.7" + local fname = ('%s/%s.%d'):format(tmpdir, (_G._nvim_test_id or 'nvim-test'), seq) io.open(fname, 'w'):close() return fname else |