mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
patch 8.2.1123: Python 3 test is old style
Problem: Python 3 test is old style. Solution: Turn into new style test. (Yegappan Lakshmanan, closes #6385)
This commit is contained in:
parent
442af2f89e
commit
effb0cd75d
@ -2308,7 +2308,6 @@ test1 \
|
||||
test42 test44 test49 \
|
||||
test52 test59 \
|
||||
test70 \
|
||||
test87 \
|
||||
test99:
|
||||
cd testdir; rm -f $@.out; $(MAKE) -f Makefile $@.out VIMPROG=../$(VIMTESTTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE)
|
||||
|
||||
|
@ -20,15 +20,12 @@ SCRIPTS_ALL = \
|
||||
|
||||
# Tests that run on most systems, but not on Amiga.
|
||||
SCRIPTS_MORE1 = \
|
||||
test52.out \
|
||||
test87.out
|
||||
|
||||
test52.out
|
||||
|
||||
# Tests that run on most systems, but not on Amiga and DOS/Windows.
|
||||
SCRIPTS_MORE2 = \
|
||||
test49.out
|
||||
|
||||
|
||||
# Tests that run on most systems, but not on VMS
|
||||
SCRIPTS_MORE4 = \
|
||||
test59.out
|
||||
@ -36,7 +33,6 @@ SCRIPTS_MORE4 = \
|
||||
# Tests specifically for MS-Windows.
|
||||
SCRIPTS_WIN32 =
|
||||
|
||||
|
||||
# Tests for the GUI.
|
||||
SCRIPTS_GUI =
|
||||
|
||||
@ -309,7 +305,6 @@ NEW_TESTS = \
|
||||
test_alot_utf8 \
|
||||
test_alot
|
||||
|
||||
|
||||
# Test targets that use runtest.vim.
|
||||
# Keep test_alot*.res as the last one, sort the others.
|
||||
# test_largefile.res is omitted, it uses too much resources to run on CI.
|
||||
|
@ -4,7 +4,7 @@
|
||||
# Authors: Zoltan Arpadffy, <arpadffy@polarhome.com>
|
||||
# Sandor Kopanyi, <sandor.kopanyi@mailbox.hu>
|
||||
#
|
||||
# Last change: 2019 May 31
|
||||
# Last change: 2020 Jul 03
|
||||
#
|
||||
# This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
|
||||
# Edit the lines in the Configuration section below to select.
|
||||
@ -115,10 +115,6 @@ SCRIPT_ODS5 = test102.out
|
||||
SCRIPT_GDIFF = test47.out
|
||||
.ENDIF
|
||||
|
||||
.IFDEF HAVE_PYTHON
|
||||
SCRIPT_PYTHON = test87.out
|
||||
.ENDIF
|
||||
|
||||
.in.out :
|
||||
-@ !clean up before doing the test
|
||||
-@ if "''F$SEARCH("test.out.*")'" .NES. "" then delete/noconfirm/nolog test.out.*
|
||||
@ -140,7 +136,7 @@ SCRIPT_PYTHON = test87.out
|
||||
-@ if "''F$SEARCH("Xtest.*")'" .NES. "" then delete/noconfirm/nolog Xtest.*.*
|
||||
|
||||
all : clean nolog $(START_WITH) $(SCRIPT) $(SCRIPT_GUI) $(SCRIPT_UNIX) $(SCRIPT_WIN) $(SCRIPT_SPELL) $(SCRIPT_ODS5) \
|
||||
$(SCRIPT_GDIFF) $(SCRIPT_MZSCH) $(SCRIPT_LUA) $(SCRIPT_PYTHON) nolog
|
||||
$(SCRIPT_GDIFF) $(SCRIPT_MZSCH) $(SCRIPT_LUA) nolog
|
||||
-@ write sys$output " "
|
||||
-@ write sys$output "-----------------------------------------------"
|
||||
-@ write sys$output " All done"
|
||||
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -560,11 +560,11 @@ endfunc
|
||||
" Test for calling a function
|
||||
func Test_python_function_call()
|
||||
func New(...)
|
||||
return ['NewStart'] + a:000 + ['NewEnd']
|
||||
return ['NewStart'] + a:000 + ['NewEnd']
|
||||
endfunc
|
||||
|
||||
func DictNew(...) dict
|
||||
return ['DictNewStart'] + a:000 + ['DictNewEnd', self]
|
||||
return ['DictNewStart'] + a:000 + ['DictNewEnd', self]
|
||||
endfunc
|
||||
|
||||
new
|
||||
@ -1312,8 +1312,8 @@ func Test_python_buffer()
|
||||
|
||||
" Test assigning to name property
|
||||
augroup BUFS
|
||||
autocmd BufFilePost * python cb.append(vim.eval('expand("<abuf>")') + ':BufFilePost:' + vim.eval('bufnr("%")'))
|
||||
autocmd BufFilePre * python cb.append(vim.eval('expand("<abuf>")') + ':BufFilePre:' + vim.eval('bufnr("%")'))
|
||||
autocmd BufFilePost * python cb.append(vim.eval('expand("<abuf>")') + ':BufFilePost:' + vim.eval('bufnr("%")'))
|
||||
autocmd BufFilePre * python cb.append(vim.eval('expand("<abuf>")') + ':BufFilePre:' + vim.eval('bufnr("%")'))
|
||||
augroup END
|
||||
py << trim EOF
|
||||
import os
|
||||
@ -1364,7 +1364,7 @@ func Test_python_buffer()
|
||||
call assert_equal([''], getline(1, '$'))
|
||||
|
||||
augroup BUFS
|
||||
autocmd!
|
||||
autocmd!
|
||||
augroup END
|
||||
augroup! BUFS
|
||||
%bw!
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -754,6 +754,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
1123,
|
||||
/**/
|
||||
1122,
|
||||
/**/
|
||||
|
Loading…
x
Reference in New Issue
Block a user