summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2019-07-30 07:47:52 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2019-07-30 07:47:52 (GMT)
commit809842a942400fa2f099485c2faa3e85d946360d (patch)
treebe55463759384fa2c23bf39db82ee742bd939299 /.travis.yml
parent6f541de9a3a5684df538e29e14259aecc2addeeb (diff)
parent50912fc63c46a741cbb7fd51f25beae99817eb41 (diff)
downloadtcl-809842a942400fa2f099485c2faa3e85d946360d.zip
tcl-809842a942400fa2f099485c2faa3e85d946360d.tar.gz
tcl-809842a942400fa2f099485c2faa3e85d946360d.tar.bz2
Merge 8.5
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml16
1 files changed, 9 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index 5da5ecd..9798220 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -215,8 +215,7 @@ matrix:
- CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit --enable-symbols"
script: *crosstest
# Test on Windows with MSVC native
-# Doesn't run tests because not all tests work in this environment. TODO: either fix or disable those test-cases!
- - name: "Windows/MSVC/Shared/no test"
+ - name: "Windows/MSVC/Shared"
os: windows
compiler: cl
env: &vcenv
@@ -227,23 +226,26 @@ matrix:
- cd ${BUILD_DIR}
install: []
script:
- - cmd.exe /C 'vcvarsall.bat x64 && nmake -f makefile.vc all tcltest'
- - name: "Windows/MSVC/Static/no test"
+ - cmd.exe /C 'vcvarsall.bat x64 && nmake OPTS=threads -f makefile.vc all tcltest'
+ - cmd.exe /C 'vcvarsall.bat x64 && nmake OPTS=threads -f makefile.vc test'
+ - name: "Windows/MSVC/Static"
os: windows
compiler: cl
env: *vcenv
before_install: *vcpreinst
install: []
script:
- - cmd.exe /C 'vcvarsall.bat x64 && nmake OPTS=static -f makefile.vc all tcltest'
- - name: "Windows/MSVC/Debug/no test"
+ - cmd.exe /C 'vcvarsall.bat x64 && nmake OPTS=static,msvcrt,threads -f makefile.vc all tcltest'
+ - cmd.exe /C 'vcvarsall.bat x64 && nmake OPTS=static,msvcrt,threads -f makefile.vc test'
+ - name: "Windows/MSVC/Debug"
os: windows
compiler: cl
env: *vcenv
before_install: *vcpreinst
install: []
script:
- - cmd.exe /C 'vcvarsall.bat x64 && nmake OPTS=symbols -f makefile.vc all tcltest'
+ - cmd.exe /C 'vcvarsall.bat x64 && nmake OPTS=symbols,msvcrt,threads -f makefile.vc all tcltest'
+ - cmd.exe /C 'vcvarsall.bat x64 && nmake OPTS=symbols,msvcrt,threads -f makefile.vc test'
before_install:
- cd ${BUILD_DIR}
install: