aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.1123: Python 3 test is old style

Browse Source 
Problem:    Python 3 test is old style.
Solution:   Turn into new style test. (Yegappan Lakshmanan, closes #6385)
This commit is contained in:
Bram Moolenaar 2020-07-03 21:17:34 +02:00
parent 442af2f89e
commit effb0cd75d
8 changed files with 3358 additions and 3231 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Makefile
View File

@ -2308,7 +2308,6 @@ test1 \
test42 test44 test49 \ test42 test44 test49 \
test52 test59 \ test52 test59 \
test70 \ test70 \
test87 \
test99: test99:
cd testdir; rm -f $@.out; $(MAKE) -f Makefile $@.out VIMPROG=../$(VIMTESTTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE) cd testdir; rm -f $@.out; $(MAKE) -f Makefile $@.out VIMPROG=../$(VIMTESTTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE)

7
src/testdir/Make_all.mak
View File

@ -20,15 +20,12 @@ SCRIPTS_ALL = \
# Tests that run on most systems, but not on Amiga. # Tests that run on most systems, but not on Amiga.
SCRIPTS_MORE1 = \ SCRIPTS_MORE1 = \
test52.out \ test52.out
test87.out
# Tests that run on most systems, but not on Amiga and DOS/Windows. # Tests that run on most systems, but not on Amiga and DOS/Windows.
SCRIPTS_MORE2 = \ SCRIPTS_MORE2 = \
test49.out test49.out
# Tests that run on most systems, but not on VMS # Tests that run on most systems, but not on VMS
SCRIPTS_MORE4 = \ SCRIPTS_MORE4 = \
test59.out test59.out
@ -36,7 +33,6 @@ SCRIPTS_MORE4 = \
# Tests specifically for MS-Windows. # Tests specifically for MS-Windows.
SCRIPTS_WIN32 = SCRIPTS_WIN32 =
# Tests for the GUI. # Tests for the GUI.
SCRIPTS_GUI = SCRIPTS_GUI =
@ -309,7 +305,6 @@ NEW_TESTS = \
test_alot_utf8 \ test_alot_utf8 \
test_alot test_alot
# Test targets that use runtest.vim. # Test targets that use runtest.vim.
# Keep test_alot*.res as the last one, sort the others. # 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. # test_largefile.res is omitted, it uses too much resources to run on CI.

8
src/testdir/Make_vms.mms
View File

@ -4,7 +4,7 @@
# Authors: Zoltan Arpadffy, <arpadffy@polarhome.com> # Authors: Zoltan Arpadffy, <arpadffy@polarhome.com>
# Sandor Kopanyi, <sandor.kopanyi@mailbox.hu> # 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. # 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. # Edit the lines in the Configuration section below to select.
@ -115,10 +115,6 @@ SCRIPT_ODS5 = test102.out
SCRIPT_GDIFF = test47.out SCRIPT_GDIFF = test47.out
.ENDIF .ENDIF
.IFDEF HAVE_PYTHON
SCRIPT_PYTHON = test87.out
.ENDIF
.in.out : .in.out :
-@ !clean up before doing the test -@ !clean up before doing the test
-@ if "''F$SEARCH("test.out.*")'" .NES. "" then delete/noconfirm/nolog test.out.* -@ 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.*.* -@ 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) \ 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 "-----------------------------------------------" -@ write sys$output "-----------------------------------------------"
-@ write sys$output " All done" -@ write sys$output " All done"

1725
src/testdir/test87.in
View File

File diff suppressed because it is too large Load Diff

1445
src/testdir/test87.ok
View File

File diff suppressed because it is too large Load Diff

3311
src/testdir/test_python3.vim
View File

File diff suppressed because it is too large Load Diff

2
src/version.c
View File

@ -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 */
/**/
1123,
/**/ /**/
1122, 1122,
/**/ /**/