Mercurial > vim
changeset 22011:2b6d696b063d v8.2.1555
patch 8.2.1555: not all tests are executed on Github Actions
Commit: https://github.com/vim/vim/commit/7d6979608ee83b06ccfab2589da3047b143defae
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Aug 31 21:30:32 2020 +0200
patch 8.2.1555: not all tests are executed on Github Actions
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)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Mon, 31 Aug 2020 21:45:03 +0200 |
parents | 35e1f299493e |
children | c0158af27bee |
files | .github/workflows/ci-windows.yaml src/testdir/runtest.vim src/testdir/test_python2.vim src/testdir/test_python3.vim src/version.c |
diffstat | 5 files changed, 15 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/.github/workflows/ci-windows.yaml +++ b/.github/workflows/ci-windows.yaml @@ -127,6 +127,11 @@ jobs: ) 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,10 +201,6 @@ jobs: 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"
--- a/src/testdir/runtest.vim +++ b/src/testdir/runtest.vim @@ -382,7 +382,9 @@ endif " 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()',
--- a/src/testdir/test_python2.vim +++ b/src/testdir/test_python2.vim @@ -2412,7 +2412,7 @@ func Test_python_chdir() cb.append(vim.eval('@%')) os.chdir('..') path = fnamemodify('.', ':p:h:t') - if path != 'src': + 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,7 +2422,8 @@ func Test_python_chdir() os.chdir(path) del path else: - cb.append(fnamemodify('.', ':p:h:t')) + # 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'))
--- a/src/testdir/test_python3.vim +++ b/src/testdir/test_python3.vim @@ -2591,7 +2591,7 @@ func Test_python3_chdir() cb.append(vim.eval('@%')) os.chdir('..') path = fnamemodify('.', ':p:h:t') - if path != b'src': + 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,7 +2600,8 @@ func Test_python3_chdir() cb.append(vim.eval('@%')[len(path)+1:].replace(os.path.sep, '/')) os.chdir(path) else: - cb.append(str(fnamemodify('.', ':p:h:t'))) + # 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')