diff options
author | Bram Moolenaar <Bram@vim.org> | 2020-08-31 21:30:32 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2020-08-31 21:30:32 +0200 |
commit | 7d6979608ee83b06ccfab2589da3047b143defae (patch) | |
tree | a0abc8a6e0379d8843562b8d71407d11be5f392e /src | |
parent | 07e87e9eb5e7195d47d47c0ca752b6c8372a99ea (diff) |
patch 8.2.1555: not all tests are executed on Github Actionsv8.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)
Diffstat (limited to 'src')
-rw-r--r-- | src/testdir/runtest.vim | 2 | ||||
-rw-r--r-- | src/testdir/test_python2.vim | 5 | ||||
-rw-r--r-- | src/testdir/test_python3.vim | 5 | ||||
-rw-r--r-- | src/version.c | 2 |
4 files changed, 10 insertions, 4 deletions
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim index 99854042b2..1a83227b1f 100644 --- 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()', diff --git a/src/testdir/test_python2.vim b/src/testdir/test_python2.vim index 8fa73401bd..fd8fe70e49 100644 --- 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')) diff --git a/src/testdir/test_python3.vim b/src/testdir/test_python3.vim index 0885c96988..1bdb4c1719 100644 --- 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') diff --git a/src/version.c b/src/version.c index 92c533c883..f5c83beca2 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1555, +/**/ 1554, /**/ 1553, |