diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-08 13:39:24 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-08 13:39:24 (GMT) |
| commit | f1d0940b8ee74ec89aa6e59fd67ff0b1cdc0002e (patch) | |
| tree | b10319c03b2f2bfb282ae0eed4a626791148fad6 | |
| parent | c6ad528613ac99850608b2e713b6962250a72950 (diff) | |
| parent | 0371dd25104a514a4dae27ce9ebd5e297afb2df8 (diff) | |
| download | tcl-f1d0940b8ee74ec89aa6e59fd67ff0b1cdc0002e.zip tcl-f1d0940b8ee74ec89aa6e59fd67ff0b1cdc0002e.tar.gz tcl-f1d0940b8ee74ec89aa6e59fd67ff0b1cdc0002e.tar.bz2 | |
Merge 8.7
| -rw-r--r-- | .travis.yml | 106 |
1 files changed, 53 insertions, 53 deletions
diff --git a/.travis.yml b/.travis.yml index 7031f36..52b2dd3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -151,118 +151,118 @@ matrix: - BUILD_DIR=macosx install: [] script: *mactest -# Test with mingw-w64 (32 bit) cross-compile +# Test with mingw-w64 cross-compile # Doesn't run tests because wine is only an imperfect Windows emulation - - name: "Linux-cross-Windows-32/GCC/Shared/no test" + - name: "Linux-cross-Windows/GCC/Shared/no test" os: linux dist: xenial - compiler: i686-w64-mingw32-gcc - addons: &mingw32 + compiler: x86_64-w64-mingw32-gcc + addons: &mingw64 apt: packages: - gcc-mingw-w64-base - - binutils-mingw-w64-i686 - - gcc-mingw-w64-i686 + - binutils-mingw-w64-x86-64 + - gcc-mingw-w64-x86-64 - gcc-mingw-w64 - - gcc-multilib - wine env: - BUILD_DIR=win - - CFGOPT=--host=i686-w64-mingw32 - script: &crosstest - - make all tcltest - # Include a high visibility marker that tests are skipped outright - - > - echo "`tput setaf 3`SKIPPED TEST: CROSS COMPILING`tput sgr0`" - - name: "Linux-cross-Windows-32/GCC/Static/no test" + - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit" + script: *crosstest + - name: "Linux-cross-Windows/GCC/Static/no test" os: linux dist: xenial - compiler: i686-w64-mingw32-gcc - addons: *mingw32 + compiler: x86_64-w64-mingw32-gcc + addons: *mingw64 env: - BUILD_DIR=win - - CFGOPT="--host=i686-w64-mingw32 --disable-shared" + - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit --disable-shared" script: *crosstest - - name: "Linux-cross-Windows-32/GCC/Shared/no test: UTF_MAX=6" + - name: "Linux-cross-Windows/GCC/Shared/no test: UTF_MAX=6" os: linux dist: xenial - compiler: i686-w64-mingw32-gcc - addons: *mingw32 + compiler: x86_64-w64-mingw32-gcc + addons: *mingw64 env: - BUILD_DIR=win - - CFGOPT="--host=i686-w64-mingw32 CFLAGS=-DTCL_UTF_MAX=6" + - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit CFLAGS=-DTCL_UTF_MAX=6" script: *crosstest - - name: "Linux-cross-Windows-32/GCC/Shared/no test: UTF_MAX=3" + - name: "Linux-cross-Windows/GCC/Shared/no test: UTF_MAX=3" os: linux dist: xenial - compiler: i686-w64-mingw32-gcc - addons: *mingw32 + compiler: x86_64-w64-mingw32-gcc + addons: *mingw64 env: - BUILD_DIR=win - - CFGOPT="--host=i686-w64-mingw32 CFLAGS=-DTCL_UTF_MAX=3" + - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit CFLAGS=-DTCL_UTF_MAX=3" script: *crosstest - - name: "Linux-cross-Windows-32/GCC/Debug/no test" + - name: "Linux-cross-Windows/GCC/Debug/no test" os: linux dist: xenial - compiler: i686-w64-mingw32-gcc - addons: *mingw32 + compiler: x86_64-w64-mingw32-gcc + addons: *mingw64 env: - BUILD_DIR=win - - CFGOPT="--host=i686-w64-mingw32 --enable-symbols" + - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit --enable-symbols" script: *crosstest -# Test with mingw-w64 (64 bit) +# Test with mingw-w64 (32 bit) cross-compile # Doesn't run tests because wine is only an imperfect Windows emulation - - name: "Linux-cross-Windows-64/GCC/Shared/no test" + - name: "Linux-cross-Windows-32/GCC/Shared/no test" os: linux dist: xenial - compiler: x86_64-w64-mingw32-gcc - addons: &mingw64 + compiler: i686-w64-mingw32-gcc + addons: &mingw32 apt: packages: - gcc-mingw-w64-base - - binutils-mingw-w64-x86-64 - - gcc-mingw-w64-x86-64 + - binutils-mingw-w64-i686 + - gcc-mingw-w64-i686 - gcc-mingw-w64 + - gcc-multilib - wine env: - BUILD_DIR=win - - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit" - script: *crosstest - - name: "Linux-cross-Windows-64/GCC/Static/no test" + - CFGOPT=--host=i686-w64-mingw32 + script: &crosstest + - make all tcltest + # Include a high visibility marker that tests are skipped outright + - > + echo "`tput setaf 3`SKIPPED TEST: CROSS COMPILING`tput sgr0`" + - name: "Linux-cross-Windows-32/GCC/Static/no test" os: linux dist: xenial - compiler: x86_64-w64-mingw32-gcc - addons: *mingw64 + compiler: i686-w64-mingw32-gcc + addons: *mingw32 env: - BUILD_DIR=win - - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit --disable-shared" + - CFGOPT="--host=i686-w64-mingw32 --disable-shared" script: *crosstest - - name: "Linux-cross-Windows-64/GCC/Shared/no test: UTF_MAX=6" + - name: "Linux-cross-Windows-32/GCC/Shared/no test: UTF_MAX=6" os: linux dist: xenial - compiler: x86_64-w64-mingw32-gcc - addons: *mingw64 + compiler: i686-w64-mingw32-gcc + addons: *mingw32 env: - BUILD_DIR=win - - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit CFLAGS=-DTCL_UTF_MAX=6" + - CFGOPT="--host=i686-w64-mingw32 CFLAGS=-DTCL_UTF_MAX=6" script: *crosstest - - name: "Linux-cross-Windows-64/GCC/Shared/no test: UTF_MAX=3" + - name: "Linux-cross-Windows-32/GCC/Shared/no test: UTF_MAX=3" os: linux dist: xenial - compiler: x86_64-w64-mingw32-gcc - addons: *mingw64 + compiler: i686-w64-mingw32-gcc + addons: *mingw32 env: - BUILD_DIR=win - - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit CFLAGS=-DTCL_UTF_MAX=3" + - CFGOPT="--host=i686-w64-mingw32 CFLAGS=-DTCL_UTF_MAX=3" script: *crosstest - - name: "Linux-cross-Windows-64/GCC/Debug/no test" + - name: "Linux-cross-Windows-32/GCC/Debug/no test" os: linux dist: xenial - compiler: x86_64-w64-mingw32-gcc - addons: *mingw64 + compiler: i686-w64-mingw32-gcc + addons: *mingw32 env: - BUILD_DIR=win - - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit --enable-symbols" + - CFGOPT="--host=i686-w64-mingw32 --enable-symbols" script: *crosstest # Test on Windows with MSVC native - name: "Windows/MSVC/Shared" |