diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2022-06-24 01:15:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-23 16:15:55 -0700 |
| commit | a9cb0b8a5a22fe0488f38ad67818111c7765f9d7 (patch) | |
| tree | 8a54657bb7e6fe05566111ef8581c1c5e9ec25ef | |
| parent | c00a3f45d47840e36c97c87e2ddf1dd2bcc2c2f7 (diff) | |
| download | rneovim-a9cb0b8a5a22fe0488f38ad67818111c7765f9d7.tar.gz rneovim-a9cb0b8a5a22fe0488f38ad67818111c7765f9d7.tar.bz2 rneovim-a9cb0b8a5a22fe0488f38ad67818111c7765f9d7.zip | |
fix(tests): remove misleading $TEST_PATH segment #19050
Problem:
RunTests.cmake adds $TEST_PATH to $TMPDIR with the implication that it
gives more isolation. But this is misleading because $TEST_PATH is only
defined once. Full test runs use the same $TMPDIR for all tests.
This was likely added with the intention of invoking RunTests.cmake
once-per-testfile from a wrapper than does the isolation/orchestration.
But even so, Nvim's vim_maketempdir() / vim_mktempdir() _already_
creates a unique tempdir per session.
Solution:
Don't append $TEST_PATH to $TMPDIR. Avoids confusion and makes the path
shorter.
| -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 |