mirror of
https://github.com/vim/vim.git
synced 2025-09-24 03:44:06 -04:00
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)
This commit is contained in:
9
.github/workflows/ci-windows.yaml
vendored
9
.github/workflows/ci-windows.yaml
vendored
@@ -127,6 +127,11 @@ jobs:
|
|||||||
)
|
)
|
||||||
goto :eof
|
goto :eof
|
||||||
|
|
||||||
|
- name: Copy src directory to src2
|
||||||
|
shell: cmd
|
||||||
|
run: |
|
||||||
|
xcopy src src2\ /E > nul
|
||||||
|
|
||||||
- name: Build (MSVC)
|
- name: Build (MSVC)
|
||||||
if: matrix.toolchain == 'msvc'
|
if: matrix.toolchain == 'msvc'
|
||||||
shell: cmd
|
shell: cmd
|
||||||
@@ -196,10 +201,6 @@ jobs:
|
|||||||
echo %COL_GREEN%vim version:%COL_RESET%
|
echo %COL_GREEN%vim version:%COL_RESET%
|
||||||
.\vim --version || exit 1
|
.\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%
|
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"
|
start cmd /c "cd ..\src2\testdir & nmake -nologo -f Make_dos.mak VIMPROG=..\..\src\vim > nul & echo done>done.txt"
|
||||||
|
|
||||||
|
@@ -382,7 +382,9 @@ endif
|
|||||||
|
|
||||||
" Names of flaky tests.
|
" Names of flaky tests.
|
||||||
let s:flaky_tests = [
|
let s:flaky_tests = [
|
||||||
|
\ 'Test_BufWrite_lockmarks()',
|
||||||
\ 'Test_autocmd_SafeState()',
|
\ 'Test_autocmd_SafeState()',
|
||||||
|
\ 'Test_bufunload_all()',
|
||||||
\ 'Test_client_server()',
|
\ 'Test_client_server()',
|
||||||
\ 'Test_close_and_exit_cb()',
|
\ 'Test_close_and_exit_cb()',
|
||||||
\ 'Test_close_output_buffer()',
|
\ 'Test_close_output_buffer()',
|
||||||
|
@@ -2412,7 +2412,7 @@ func Test_python_chdir()
|
|||||||
cb.append(vim.eval('@%'))
|
cb.append(vim.eval('@%'))
|
||||||
os.chdir('..')
|
os.chdir('..')
|
||||||
path = fnamemodify('.', ':p:h:t')
|
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
|
# Running tests from a shadow directory, so move up another level
|
||||||
# This will result in @% looking like shadow/testdir/Xfile, hence the
|
# This will result in @% looking like shadow/testdir/Xfile, hence the
|
||||||
# extra fnamemodify
|
# extra fnamemodify
|
||||||
@@ -2422,7 +2422,8 @@ func Test_python_chdir()
|
|||||||
os.chdir(path)
|
os.chdir(path)
|
||||||
del path
|
del path
|
||||||
else:
|
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, '/'))
|
cb.append(vim.eval('@%').replace(os.path.sep, '/'))
|
||||||
os.chdir('testdir')
|
os.chdir('testdir')
|
||||||
cb.append(fnamemodify('.', ':p:h:t'))
|
cb.append(fnamemodify('.', ':p:h:t'))
|
||||||
|
@@ -2591,7 +2591,7 @@ func Test_python3_chdir()
|
|||||||
cb.append(vim.eval('@%'))
|
cb.append(vim.eval('@%'))
|
||||||
os.chdir('..')
|
os.chdir('..')
|
||||||
path = fnamemodify('.', ':p:h:t')
|
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
|
# Running tests from a shadow directory, so move up another level
|
||||||
# This will result in @% looking like shadow/testdir/Xfile, hence the
|
# This will result in @% looking like shadow/testdir/Xfile, hence the
|
||||||
# slicing to remove the leading path and path separator
|
# 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, '/'))
|
cb.append(vim.eval('@%')[len(path)+1:].replace(os.path.sep, '/'))
|
||||||
os.chdir(path)
|
os.chdir(path)
|
||||||
else:
|
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, '/'))
|
cb.append(vim.eval('@%').replace(os.path.sep, '/'))
|
||||||
del path
|
del path
|
||||||
os.chdir('testdir')
|
os.chdir('testdir')
|
||||||
|
@@ -754,6 +754,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1555,
|
||||||
/**/
|
/**/
|
||||||
1554,
|
1554,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user