diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-11-04 15:01:56 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-11-10 00:38:24 +0530 |
| commit | 304061644bdc6c40f6914142d48385346c95b390 (patch) | |
| tree | 2de51f37a2f60cb35d0597f3965a2fa7ca75167b | |
| parent | 5fdac48250c0e4a7ad6e9b92041ab7b4d1bd02ec (diff) | |
| download | meson-304061644bdc6c40f6914142d48385346c95b390.zip meson-304061644bdc6c40f6914142d48385346c95b390.tar.gz meson-304061644bdc6c40f6914142d48385346c95b390.tar.bz2 | |
appveyor.yml: Test more than just MSVC2010 + Ninja on x86
Now we test:
MSVC 2010 + Ninja (x86)
MSVC 2015 + Ninja (x86)
MSVC 2015 + Ninja (x86_64)
MSVC 2010 + MSBuild (x86)
MSVC 2015 + MSBuild (x86)
MSVC 2015 + MSBuild (x86_64)
MSVC 2010 Express only shipped with an x86 toolchain, so we can only
test x86 for that.
| -rw-r--r-- | .appveyor.yml | 38 |
1 files changed, 33 insertions, 5 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 38ebe56..1479455 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -2,23 +2,51 @@ version: 1.0.{build} os: Visual Studio 2015 +environment: + matrix: + - arch: x86 + compiler: msvc2010 + backend: ninja + + - arch: x86 + compiler: msvc2010 + backend: vs2010 + + - arch: x86 + compiler: msvc2015 + backend: ninja + + - arch: x86 + compiler: msvc2015 + backend: vs2015 + + - arch: x64 + compiler: msvc2015 + backend: ninja + + - arch: x64 + compiler: msvc2015 + backend: vs2015 + platform: - - x86 + - x64 branches: only: - master install: - - ps: (new-object net.webclient).DownloadFile('https://dl.dropboxusercontent.com/u/37517477/ninja.exe', 'c:\python34\ninja.exe') - - cmd: copy c:\python34\python.exe c:\python34\python3.exe - - '"C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x86' + - ps: (new-object net.webclient).DownloadFile('https://dl.dropboxusercontent.com/u/37517477/ninja.exe', 'c:\python34\ninja.exe') + - cmd: copy c:\python34\python.exe c:\python34\python3.exe + - cmd: if %compiler%==msvc2010 ( call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" %arch% ) + - cmd: if %compiler%==msvc2015 ( call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %arch% ) build_script: - cmd: echo No build step. test_script: - - cmd: PATH c:\python34;%PATH%; && python3 run_tests.py --backend=ninja + - cmd: echo Running tests for %arch% and %compiler% with the %backend% backend + - cmd: PATH=c:\python34;%PATH%; && python3 run_tests.py --backend=%backend% on_finish: - appveyor PushArtifact meson-test-run.txt -DeploymentName "Text test logs" |