To: vim_dev@googlegroups.com Subject: Patch 8.2.1555 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1555 Problem: Not all tests are executed on Github Actions. Solution: Copy "src" to "src2" earlier. Recognize "src2" in a couple more places. Add two tests to the list of flaky tests. (Ken Takata, closes #6798) Files: .github/workflows/ci-windows.yaml, src/testdir/runtest.vim, src/testdir/test_python2.vim, src/testdir/test_python3.vim *** ../vim-8.2.1554/.github/workflows/ci-windows.yaml 2020-08-01 12:25:59.853732172 +0200 --- .github/workflows/ci-windows.yaml 2020-08-31 21:27:16.603060224 +0200 *************** *** 127,132 **** --- 127,137 ---- ) goto :eof + - name: Copy src directory to src2 + shell: cmd + run: | + xcopy src src2\ /E > nul + - name: Build (MSVC) if: matrix.toolchain == 'msvc' shell: cmd *************** *** 196,205 **** echo %COL_GREEN%vim version:%COL_RESET% .\vim --version || exit 1 - mkdir ..\src2 - xcopy testdir ..\src2\testdir\ /E > nul || exit 1 - copy evalfunc.c ..\src2 > nul - echo %COL_GREEN%Start testing vim in background.%COL_RESET% start cmd /c "cd ..\src2\testdir & nmake -nologo -f Make_dos.mak VIMPROG=..\..\src\vim > nul & echo done>done.txt" --- 201,206 ---- *** ../vim-8.2.1554/src/testdir/runtest.vim 2020-08-13 18:57:56.558214754 +0200 --- src/testdir/runtest.vim 2020-08-31 21:27:16.603060224 +0200 *************** *** 382,388 **** --- 382,390 ---- " Names of flaky tests. let s:flaky_tests = [ + \ 'Test_BufWrite_lockmarks()', \ 'Test_autocmd_SafeState()', + \ 'Test_bufunload_all()', \ 'Test_client_server()', \ 'Test_close_and_exit_cb()', \ 'Test_close_output_buffer()', *** ../vim-8.2.1554/src/testdir/test_python2.vim 2020-07-11 22:14:54.314422214 +0200 --- src/testdir/test_python2.vim 2020-08-31 21:27:16.603060224 +0200 *************** *** 2412,2418 **** cb.append(vim.eval('@%')) os.chdir('..') path = fnamemodify('.', ':p:h:t') ! if path != 'src': # Running tests from a shadow directory, so move up another level # This will result in @% looking like shadow/testdir/Xfile, hence the # extra fnamemodify --- 2412,2418 ---- cb.append(vim.eval('@%')) os.chdir('..') path = fnamemodify('.', ':p:h:t') ! if path != 'src' and path != 'src2': # Running tests from a shadow directory, so move up another level # This will result in @% looking like shadow/testdir/Xfile, hence the # extra fnamemodify *************** *** 2422,2428 **** os.chdir(path) del path else: ! cb.append(fnamemodify('.', ':p:h:t')) cb.append(vim.eval('@%').replace(os.path.sep, '/')) os.chdir('testdir') cb.append(fnamemodify('.', ':p:h:t')) --- 2422,2429 ---- os.chdir(path) del path else: ! # Also accept running from src2/testdir/ for MS-Windows CI. ! cb.append(fnamemodify('.', ':p:h:t').replace('src2', 'src')) cb.append(vim.eval('@%').replace(os.path.sep, '/')) os.chdir('testdir') cb.append(fnamemodify('.', ':p:h:t')) *** ../vim-8.2.1554/src/testdir/test_python3.vim 2020-08-29 12:57:12.587813107 +0200 --- src/testdir/test_python3.vim 2020-08-31 21:27:16.607060201 +0200 *************** *** 2591,2597 **** cb.append(vim.eval('@%')) os.chdir('..') path = fnamemodify('.', ':p:h:t') ! if path != b'src': # Running tests from a shadow directory, so move up another level # This will result in @% looking like shadow/testdir/Xfile, hence the # slicing to remove the leading path and path separator --- 2591,2597 ---- cb.append(vim.eval('@%')) os.chdir('..') path = fnamemodify('.', ':p:h:t') ! if path != b'src' and path != b'src2': # Running tests from a shadow directory, so move up another level # This will result in @% looking like shadow/testdir/Xfile, hence the # slicing to remove the leading path and path separator *************** *** 2600,2606 **** cb.append(vim.eval('@%')[len(path)+1:].replace(os.path.sep, '/')) os.chdir(path) else: ! cb.append(str(fnamemodify('.', ':p:h:t'))) cb.append(vim.eval('@%').replace(os.path.sep, '/')) del path os.chdir('testdir') --- 2600,2607 ---- cb.append(vim.eval('@%')[len(path)+1:].replace(os.path.sep, '/')) os.chdir(path) else: ! # Also accept running from src2/testdir/ for MS-Windows CI. ! cb.append(str(fnamemodify('.', ':p:h:t').replace(b'src2', b'src'))) cb.append(vim.eval('@%').replace(os.path.sep, '/')) del path os.chdir('testdir') *** ../vim-8.2.1554/src/version.c 2020-08-31 21:22:34.048175550 +0200 --- src/version.c 2020-08-31 21:29:58.054176525 +0200 *************** *** 756,757 **** --- 756,759 ---- { /* Add new patch number below this line */ + /**/ + 1555, /**/ -- Not too long ago, a keyboard was something to make music with... /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///