attempt to split out x64 tests since appveyor only allows 40 minutes of runtime

This commit is contained in:
arvidn 2015-08-26 23:51:31 -04:00 committed by arvidn
parent e3591c3a1c
commit 1cd6fe6c01
1 changed files with 19 additions and 10 deletions

View File

@ -8,14 +8,18 @@ environment:
matrix: matrix:
- variant: test_debug - variant: test_debug
compiler: msvc-14.0 compiler: msvc-14.0
x64: 1
sim: 1 sim: 1
linkflags32: '"/LIBPATH:C:\\openssl-1.0.1p-vs2015\\lib"' linkflags32: '"/LIBPATH:C:\\openssl-1.0.1p-vs2015\\lib"'
linkflags64: '"/LIBPATH:C:\\openssl-1.0.1p-vs2015\\lib64"' linkflags64: '"/LIBPATH:C:\\openssl-1.0.1p-vs2015\\lib64"'
include: '"c:\\openssl-1.0.1p-vs2015\\include"' include: '"c:\\openssl-1.0.1p-vs2015\\include"'
- variant: test_debug - variant: test_debug
compiler: msvc-12.0 compiler: msvc-14.0
x64: 1 x64: 1
linkflags32: '"/LIBPATH:C:\\openssl-1.0.1p-vs2015\\lib"'
linkflags64: '"/LIBPATH:C:\\openssl-1.0.1p-vs2015\\lib64"'
include: '"c:\\openssl-1.0.1p-vs2015\\include"'
- variant: test_debug
compiler: msvc-12.0
linkflags32: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib"' linkflags32: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib"'
linkflags64: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib64"' linkflags64: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib64"'
include: '"c:\\openssl-1.0.1p-vs2013\\include"' include: '"c:\\openssl-1.0.1p-vs2013\\include"'
@ -24,6 +28,11 @@ environment:
linkflags32: '"/LIBPATH:C:\\openssl-1.0.1p-vs2010\\lib"' linkflags32: '"/LIBPATH:C:\\openssl-1.0.1p-vs2010\\lib"'
linkflags64: '"/LIBPATH:C:\\openssl-1.0.1p-vs2010\\lib64"' linkflags64: '"/LIBPATH:C:\\openssl-1.0.1p-vs2010\\lib64"'
include: '"c:\\openssl-1.0.1p-vs2010\\include"' include: '"c:\\openssl-1.0.1p-vs2010\\include"'
- variant: test_barebones
compiler: msvc-12.0
linkflags32: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib"'
linkflags64: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib64"'
include: '"c:\\openssl-1.0.1p-vs2013\\include"'
- variant: test_barebones - variant: test_barebones
compiler: msvc-12.0 compiler: msvc-12.0
x64: 1 x64: 1
@ -32,7 +41,6 @@ environment:
include: '"c:\\openssl-1.0.1p-vs2013\\include"' include: '"c:\\openssl-1.0.1p-vs2013\\include"'
- variant: test_release - variant: test_release
compiler: msvc-12.0 compiler: msvc-12.0
x64: 1
linkflags32: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib"' linkflags32: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib"'
linkflags64: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib64"' linkflags64: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib64"'
include: '"c:\\openssl-1.0.1p-vs2013\\include"' include: '"c:\\openssl-1.0.1p-vs2013\\include"'
@ -99,18 +107,19 @@ cache:
- openssl-1.0.1p-vs2013.7z - openssl-1.0.1p-vs2013.7z
- openssl-1.0.1p-vs2015.7z - openssl-1.0.1p-vs2015.7z
build_script: build_script:
- cd %ROOT_DIRECTORY%\examples
- b2.exe --hash -j2 %compiler% variant=%variant% linkflags=%linkflags32% include=%include%
- cd %ROOT_DIRECTORY%\test - cd %ROOT_DIRECTORY%\test
- b2.exe --hash -j2 address-model=32 win-tests %compiler% variant=%variant% link=shared linkflags=%linkflags32% include=%include%
- if defined x64 ( - if defined x64 (
b2.exe --hash -j2 address-model=64 win-tests %compiler% variant=%variant% link=shared linkflags=%linkflags64% include=%include% b2.exe --hash -j2 address-model=64 win-tests %compiler% variant=%variant% link=shared linkflags=%linkflags64% include=%include%
) else (
b2.exe --hash -j2 address-model=32 win-tests %compiler% variant=%variant% link=shared linkflags=%linkflags32% include=%include%
& cd %ROOT_DIRECTORY%\examples
& b2.exe --hash -j2 %compiler% variant=%variant% linkflags=%linkflags32% include=%include%
& cd %ROOT_DIRECTORY%\bindings\python
& b2.exe --hash -j2 %compiler% stage_module variant=%variant% linkflags=%linkflags32% include=%include%
& python test.py
) )
- cd %ROOT_DIRECTORY%\bindings\python
- b2.exe --hash -j2 %compiler% stage_module variant=%variant% linkflags=%linkflags32% include=%include%
- python test.py
- if defined sim ( - if defined sim (
cd %ROOT_DIRECTORY%\simulation cd %ROOT_DIRECTORY%\simulation
&& b2.exe --hash -j2 link=shared crypto=built-in %compiler% & b2.exe --hash -j2 link=shared crypto=built-in %compiler%
) )