Skip to content

Commit

Permalink
patch 9.0.1206: testing with Python on AppVeyor does not work properly
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
zewpo authored and brammool committed Jan 16, 2023
1 parent ae3205a commit 5a57a5e
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 26 deletions.
26 changes: 3 additions & 23 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
50 changes: 47 additions & 3 deletions ci/appveyor.bat
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@echo off
:: Batch file for building/testing Vim on AppVeyor
set target=%1

setlocal ENABLEDELAYEDEXPANSION
cd %APPVEYOR_BUILD_FOLDER%
Expand All @@ -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

Expand Down Expand Up @@ -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 (
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Original file line number Diff line number Diff line change
Expand Up @@ -695,6 +695,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1206,
/**/
1205,
/**/
Expand Down

0 comments on commit 5a57a5e

Please sign in to comment.