forked from aniani/vim
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)
This commit is contained in:
parent
ae3205aa55
commit
5a57a5e209
@ -35,34 +35,14 @@ matrix:
|
|||||||
fast_finish: true
|
fast_finish: true
|
||||||
|
|
||||||
before_build:
|
before_build:
|
||||||
# - systeminfo
|
|
||||||
# - wmic /NameSpace:\\root\Microsoft\Windows\Storage Path MSFT_PhysicalDisk get FriendlyName,Model,AllocatedSize,UniqueId
|
|
||||||
- setlocal ENABLEDELAYEDEXPANSION
|
|
||||||
- call ver
|
- call ver
|
||||||
- set "VSWHERE=%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
|
- ci\appveyor.bat install
|
||||||
- >
|
|
||||||
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
|
|
||||||
|
|
||||||
build_script:
|
build_script:
|
||||||
- ci/appveyor.bat
|
- ci\appveyor.bat build
|
||||||
|
|
||||||
test_script:
|
test_script:
|
||||||
- cd src/testdir
|
- ci\appveyor.bat test
|
||||||
# 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
|
|
||||||
|
|
||||||
artifacts:
|
artifacts:
|
||||||
- path: src/vim.exe
|
- path: src/vim.exe
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
@echo off
|
@echo off
|
||||||
:: Batch file for building/testing Vim on AppVeyor
|
:: Batch file for building/testing Vim on AppVeyor
|
||||||
|
set target=%1
|
||||||
|
|
||||||
setlocal ENABLEDELAYEDEXPANSION
|
setlocal ENABLEDELAYEDEXPANSION
|
||||||
cd %APPVEYOR_BUILD_FOLDER%
|
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_URL=https://www.python.org/ftp/python/%PYTHON3_RELEASE%/python-%PYTHON3_RELEASE%-amd64.exe
|
||||||
set PYTHON3_DIR=C:\python%PYTHON3_VER%-x64
|
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
|
if not exist downloads mkdir downloads
|
||||||
|
|
||||||
:: Python 3
|
:: Python 3
|
||||||
if not exist %PYTHON3_DIR% (
|
if not exist %PYTHON3_DIR% (
|
||||||
call :downloadfile %PYTHON3_URL% downloads\python3.exe
|
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
|
cd src
|
||||||
|
|
||||||
@ -53,11 +84,24 @@ echo "version output MSVC console"
|
|||||||
.\vim --version || exit 1
|
.\vim --version || exit 1
|
||||||
echo "version output MSVC GUI"
|
echo "version output MSVC GUI"
|
||||||
type ver_msvc.txt || exit 1
|
type ver_msvc.txt || exit 1
|
||||||
cd ..
|
|
||||||
|
|
||||||
goto :eof
|
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
|
:downloadfile
|
||||||
:: call :downloadfile <URL> <localfile>
|
:: call :downloadfile <URL> <localfile>
|
||||||
if not exist %2 (
|
if not exist %2 (
|
||||||
|
@ -695,6 +695,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 */
|
||||||
|
/**/
|
||||||
|
1206,
|
||||||
/**/
|
/**/
|
||||||
1205,
|
1205,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user