Mercurial > vim
changeset 31748:0c7d833308c7 v9.0.1206
patch 9.0.1206: testing with Python on AppVeyor does not work properly
Commit: https://github.com/vim/vim/commit/5a57a5e209bff2bc11bfde69184bbfb0362c0b99
Author: Christopher Plewright <chris@createng.com>
Date: Mon Jan 16 13:01:28 2023 +0000
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)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 16 Jan 2023 14:15:03 +0100 |
| parents | f1f2cc4c50bc |
| children | e496296f7aaa |
| files | .appveyor.yml ci/appveyor.bat src/version.c |
| diffstat | 3 files changed, 52 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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 (