Skip to content

Commit 5a57a5e

Browse files
zewpobrammool
authored andcommitted
patch 9.0.1206: testing with Python on AppVeyor does not work properly
Problem: Testing with Python on AppVeyor does not work properly. Solution: Fix typo. Move most lines to the .bat file. (Christopher Plewright, closes vim#11828)
1 parent ae3205a commit 5a57a5e

File tree

3 files changed

+52
-26
lines changed

3 files changed

+52
-26
lines changed

.appveyor.yml

+3-23
Original file line numberDiff line numberDiff line change
@@ -35,34 +35,14 @@ matrix:
3535
fast_finish: true
3636

3737
before_build:
38-
# - systeminfo
39-
# - wmic /NameSpace:\\root\Microsoft\Windows\Storage Path MSFT_PhysicalDisk get FriendlyName,Model,AllocatedSize,UniqueId
40-
- setlocal ENABLEDELAYEDEXPANSION
4138
- call ver
42-
- set "VSWHERE=%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
43-
- >
44-
if exist "%VSWHERE%" (
45-
for /f "usebackq delims=" %%i
46-
in (`"%VSWHERE%" -products * -latest -property installationPath`)
47-
do (set "VCVARSALL=%%i\VC\Auxiliary\Build\vcvarsall.bat")
48-
)
49-
- >
50-
if not exist "%VCVARSALL%" (
51-
set "VCVARSALL=%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"
52-
)
53-
- call "%VCVARSALL%" x64
39+
- ci\appveyor.bat install
5440

5541
build_script:
56-
- ci/appveyor.bat
42+
- ci\appveyor.bat build
5743

5844
test_script:
59-
- cd src/testdir
60-
# Testing with MSVC gvim
61-
- path C:\Python38-x64;%PATH%
62-
- nmake -f Make_mvc.mak VIMPROG=..\gvim
63-
- nmake -f Make_mvc.mak clean
64-
# Testing with MSVC console version
65-
- nmake -f Make_mvc.mak VIMPROG=..\vim
45+
- ci\appveyor.bat test
6646

6747
artifacts:
6848
- path: src/vim.exe

ci/appveyor.bat

+47-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
@echo off
22
:: Batch file for building/testing Vim on AppVeyor
3+
set target=%1
34

45
setlocal ENABLEDELAYEDEXPANSION
56
cd %APPVEYOR_BUILD_FOLDER%
@@ -10,13 +11,43 @@ set PYTHON3_RELEASE=3.11.1
1011
set PYTHON3_URL=https://www.python.org/ftp/python/%PYTHON3_RELEASE%/python-%PYTHON3_RELEASE%-amd64.exe
1112
set PYTHON3_DIR=C:\python%PYTHON3_VER%-x64
1213

14+
set "VSWHERE=%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
15+
16+
if exist "%VSWHERE%" (
17+
for /f "usebackq delims=" %%i in (
18+
`"%VSWHERE%" -products * -latest -property installationPath`
19+
) do (
20+
set "VCVARSALL=%%i\VC\Auxiliary\Build\vcvarsall.bat"
21+
)
22+
)
23+
24+
if not exist "%VCVARSALL%" (
25+
set "VCVARSALL=%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"
26+
)
27+
call "%VCVARSALL%" x64
28+
29+
goto %target%
30+
echo Unknown build target.
31+
exit 1
32+
33+
:: ----------------------------------------------------------------------------
34+
:install
35+
@echo on
1336
if not exist downloads mkdir downloads
1437

1538
:: Python 3
1639
if not exist %PYTHON3_DIR% (
1740
call :downloadfile %PYTHON3_URL% downloads\python3.exe
18-
cmd /c start /wait downloads\python3.exe /quiet TargetDir=%PYTHON3_DIR% Include_pip=0 Include_tcltk=0 Include_test=0 Include_tools=0 AssociateFiles=0 Shortcuts=0 Include_doc=0 Include_launcher=0 InstallLauncherAllUsers=0
41+
cmd /c start /wait downloads\python3.exe /quiet TargetDir=%PYTHON3_DIR% ^
42+
Include_pip=0 Include_tcltk=0 Include_test=0 Include_tools=0 ^
43+
AssociateFiles=0 Shortcuts=0 Include_doc=0 Include_launcher=0 ^
44+
InstallLauncherAllUsers=0
1945
)
46+
@echo off
47+
goto :eof
48+
49+
:: ----------------------------------------------------------------------------
50+
:build
2051

2152
cd src
2253

@@ -53,11 +84,24 @@ echo "version output MSVC console"
5384
.\vim --version || exit 1
5485
echo "version output MSVC GUI"
5586
type ver_msvc.txt || exit 1
56-
cd ..
5787

5888
goto :eof
59-
:: ----------------------------------------------------------------------
6089

90+
:: ----------------------------------------------------------------------------
91+
:test
92+
@echo on
93+
cd src/testdir
94+
:: Testing with MSVC gvim
95+
path %PYTHON3_DIR%;%PATH%
96+
nmake -f Make_mvc.mak VIMPROG=..\gvim
97+
nmake -f Make_mvc.mak clean
98+
:: Testing with MSVC console version
99+
nmake -f Make_mvc.mak VIMPROG=..\vim
100+
101+
@echo off
102+
goto :eof
103+
104+
:: ----------------------------------------------------------------------------
61105
:downloadfile
62106
:: call :downloadfile <URL> <localfile>
63107
if not exist %2 (

src/version.c

+2
Original file line numberDiff line numberDiff line change
@@ -695,6 +695,8 @@ static char *(features[]) =
695695

696696
static int included_patches[] =
697697
{ /* Add new patch number below this line */
698+
/**/
699+
1206,
698700
/**/
699701
1205,
700702
/**/

0 commit comments

Comments
 (0)