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 #11828)

diff --git a/.appveyor.yml b/.appveyor.yml
index f5eed932005a69bf17c46f3a291c1121b07b2c4b..2d7383b971c0ed5cfd4e83cf8d554f036bd5fd60 100644 (file)
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -35,34 +35,14 @@ matrix:
   fast_finish: true
 
 before_build:
-  # - systeminfo
-  # - wmic /NameSpace:\\root\Microsoft\Windows\Storage Path MSFT_PhysicalDisk get FriendlyName,Model,AllocatedSize,UniqueId
-  - setlocal ENABLEDELAYEDEXPANSION
   - call ver
-  - set "VSWHERE=%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
-  - >
-    if exist "%VSWHERE%" (
-    for /f "usebackq delims=" %%i
-    in (`"%VSWHERE%" -products * -latest -property installationPath`) 
-    do (set "VCVARSALL=%%i\VC\Auxiliary\Build\vcvarsall.bat")
-    )
-  - > 
-    if not exist "%VCVARSALL%" (
-    set "VCVARSALL=%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"
-    )
-  - call "%VCVARSALL%" x64
+  - ci\appveyor.bat install
 
 build_script:
-  - ci/appveyor.bat
+  - ci\appveyor.bat build
 
 test_script:
-  - cd src/testdir
-    # Testing with MSVC gvim
-  - path C:\Python38-x64;%PATH%
-  - nmake -f Make_mvc.mak VIMPROG=..\gvim
-  - nmake -f Make_mvc.mak clean
-    # Testing with MSVC console version
-  - nmake -f Make_mvc.mak VIMPROG=..\vim
+  - ci\appveyor.bat test
 
 artifacts:
   - path: src/vim.exe

diff --git a/ci/appveyor.bat b/ci/appveyor.bat
index d868380f3686bfd43127ae80abfb4b1323e3100b..5498769515955ec11621a92d5f2b7523eb15024d 100644 (file)
--- a/ci/appveyor.bat
+++ b/ci/appveyor.bat
@@ -1,5 +1,6 @@
 @echo off
 :: Batch file for building/testing Vim on AppVeyor
+set target=%1
 
 setlocal ENABLEDELAYEDEXPANSION
 cd %APPVEYOR_BUILD_FOLDER%
@@ -10,13 +11,43 @@ set PYTHON3_RELEASE=3.11.1
 set PYTHON3_URL=https://www.python.org/ftp/python/%PYTHON3_RELEASE%/python-%PYTHON3_RELEASE%-amd64.exe
 set PYTHON3_DIR=C:\python%PYTHON3_VER%-x64
 
+set "VSWHERE=%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
+
+if exist "%VSWHERE%" (
+  for /f "usebackq delims=" %%i in (
+    `"%VSWHERE%" -products * -latest -property installationPath`
+  ) do (
+    set "VCVARSALL=%%i\VC\Auxiliary\Build\vcvarsall.bat"
+  )
+)
+
+if not exist "%VCVARSALL%" (
+  set "VCVARSALL=%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"
+)
+call "%VCVARSALL%" x64
+
+goto %target%
+echo Unknown build target.
+exit 1
+
+:: ----------------------------------------------------------------------------
+:install
+@echo on
 if not exist downloads mkdir downloads
 
 :: Python 3
 if not exist %PYTHON3_DIR% (
   call :downloadfile %PYTHON3_URL% downloads\python3.exe
-  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
+  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
 )
+@echo off
+goto :eof
+
+:: ----------------------------------------------------------------------------
+:build
 
 cd src
 
@@ -53,11 +84,24 @@ echo "version output MSVC console"
 .\vim --version || exit 1
 echo "version output MSVC GUI"
 type ver_msvc.txt || exit 1
-cd ..
 
 goto :eof
-:: ----------------------------------------------------------------------
 
+:: ----------------------------------------------------------------------------
+:test
+@echo on
+cd src/testdir
+:: Testing with MSVC gvim
+path %PYTHON3_DIR%;%PATH%
+nmake -f Make_mvc.mak VIMPROG=..\gvim
+nmake -f Make_mvc.mak clean
+:: Testing with MSVC console version
+nmake -f Make_mvc.mak VIMPROG=..\vim
+
+@echo off
+goto :eof
+
+:: ----------------------------------------------------------------------------
 :downloadfile
 :: call :downloadfile <URL> <localfile>
 if not exist %2 (

diff --git a/src/version.c b/src/version.c
index 6baed862d1bfde95bb6f1eb27a680faa86c1726e..78259846bbdd9ac2158b6782eb88b0715527f8db 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1206,
 /**/
     1205,
 /**/