diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-10-10 19:19:38 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-10-10 19:19:38 (GMT) |
| commit | c358ee8f7857f8f57daccb182fb6ce137340069f (patch) | |
| tree | c04abed8117c7cf02961c7fb0d88ca545dcded1f | |
| parent | 24a1b4e94f0315a65cdc377ff5b3a8680a50a0a8 (diff) | |
| parent | 9b9ef79f51faabc336eaacbafccd4b5172126de8 (diff) | |
| download | tcl-c358ee8f7857f8f57daccb182fb6ce137340069f.zip tcl-c358ee8f7857f8f57daccb182fb6ce137340069f.tar.gz tcl-c358ee8f7857f8f57daccb182fb6ce137340069f.tar.bz2 | |
Merge 8.7
| -rw-r--r-- | .travis.yml | 78 |
1 files changed, 2 insertions, 76 deletions
diff --git a/.travis.yml b/.travis.yml index c33476a..d22d28e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -165,14 +165,13 @@ matrix: os: linux dist: xenial compiler: x86_64-w64-mingw32-gcc - addons: &mingw64 + addons: apt: packages: - gcc-mingw-w64-base - binutils-mingw-w64-x86-64 - gcc-mingw-w64-x86-64 - gcc-mingw-w64 - - wine env: - BUILD_DIR=win - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit" @@ -181,49 +180,13 @@ matrix: # Include a high visibility marker that tests are skipped outright - > echo "`tput setaf 3`SKIPPED TEST: CROSS COMPILING`tput sgr0`" - - name: "Linux-cross-Windows/GCC/Shared/no test: UTF_MAX=6" - os: linux - dist: xenial - compiler: x86_64-w64-mingw32-gcc - addons: *mingw64 - env: - - BUILD_DIR=win - - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit CFLAGS=-DTCL_UTF_MAX=6" - script: *crosstest - - name: "Linux-cross-Windows/GCC/Shared/no test: UTF_MAX=3" - os: linux - dist: xenial - compiler: x86_64-w64-mingw32-gcc - addons: *mingw64 - env: - - BUILD_DIR=win - - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit CFLAGS=-DTCL_UTF_MAX=3" - script: *crosstest - - name: "Linux-cross-Windows/GCC/Static/no test" - os: linux - dist: xenial - compiler: x86_64-w64-mingw32-gcc - addons: *mingw64 - env: - - BUILD_DIR=win - - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit --disable-shared" - script: *crosstest - - name: "Linux-cross-Windows/GCC/Debug/no test" - os: linux - dist: xenial - compiler: x86_64-w64-mingw32-gcc - addons: *mingw64 - env: - - BUILD_DIR=win - - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit --enable-symbols" - script: *crosstest # Test with mingw-w64 (32 bit) cross-compile # Doesn't run tests because wine is only an imperfect Windows emulation - name: "Linux-cross-Windows-32/GCC/Shared/no test" os: linux dist: xenial compiler: i686-w64-mingw32-gcc - addons: &mingw32 + addons: apt: packages: - gcc-mingw-w64-base @@ -231,47 +194,10 @@ matrix: - gcc-mingw-w64-i686 - gcc-mingw-w64 - gcc-multilib - - wine env: - BUILD_DIR=win - CFGOPT=--host=i686-w64-mingw32 script: *crosstest - - name: "Linux-cross-Windows-32/GCC/Shared/no test: UTF_MAX=6" - os: linux - dist: xenial - compiler: i686-w64-mingw32-gcc - addons: *mingw32 - env: - - BUILD_DIR=win - - CFGOPT="--host=i686-w64-mingw32 CFLAGS=-DTCL_UTF_MAX=6" - script: *crosstest - - name: "Linux-cross-Windows-32/GCC/Shared/no test: UTF_MAX=3" - os: linux - dist: xenial - compiler: i686-w64-mingw32-gcc - addons: *mingw32 - env: - - BUILD_DIR=win - - CFGOPT="--host=i686-w64-mingw32 CFLAGS=-DTCL_UTF_MAX=3" - script: *crosstest - - name: "Linux-cross-Windows-32/GCC/Static/no test" - os: linux - dist: xenial - compiler: i686-w64-mingw32-gcc - addons: *mingw32 - env: - - BUILD_DIR=win - - CFGOPT="--host=i686-w64-mingw32 --disable-shared" - script: *crosstest - - name: "Linux-cross-Windows-32/GCC/Debug/no test" - os: linux - dist: xenial - compiler: i686-w64-mingw32-gcc - addons: *mingw32 - env: - - BUILD_DIR=win - - CFGOPT="--host=i686-w64-mingw32 --enable-symbols" - script: *crosstest # Test on Windows with MSVC native - name: "Windows/MSVC/Shared" os: windows |