summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-04-01 09:35:29 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-04-01 09:35:29 (GMT)
commitac15e0156cf7f5bd5d4472dc4d15ad629ed3d9a1 (patch)
tree3dea261a267aec7a4058b595abba104bc0cddd2d
parent0ea08dbbf2e95be9b6cfab57277b60e01a15e996 (diff)
downloadtcl-ac15e0156cf7f5bd5d4472dc4d15ad629ed3d9a1.zip
tcl-ac15e0156cf7f5bd5d4472dc4d15ad629ed3d9a1.tar.gz
tcl-ac15e0156cf7f5bd5d4472dc4d15ad629ed3d9a1.tar.bz2
More Mem-Debug builds, using MSVC.
Install libtommath on MacOS, in order to assure that the built-in libtommath doesn't conflict with that.
-rw-r--r--.travis.yml53
1 files changed, 36 insertions, 17 deletions
diff --git a/.travis.yml b/.travis.yml
index 8c04f0c..1f7b2d5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,15 @@
sudo: false
language: c
-
+addons:
+ apt:
+ packages:
+ - binutils-mingw-w64-i686
+ - binutils-mingw-w64-x86-64
+ - gcc-mingw-w64
+ - gcc-mingw-w64-base
+ - gcc-mingw-w64-i686
+ - gcc-mingw-w64-x86-64
+ - gcc-multilib
matrix:
include:
# Testing on Linux with various compilers
@@ -160,13 +169,6 @@ matrix:
os: linux
dist: bionic
compiler: x86_64-w64-mingw32-gcc
- addons:
- apt:
- packages:
- - gcc-mingw-w64-base
- - binutils-mingw-w64-x86-64
- - gcc-mingw-w64-x86-64
- - gcc-mingw-w64
env:
- BUILD_DIR=win
- CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit"
@@ -181,14 +183,6 @@ matrix:
os: linux
dist: bionic
compiler: i686-w64-mingw32-gcc
- addons:
- apt:
- packages:
- - gcc-mingw-w64-base
- - binutils-mingw-w64-i686
- - gcc-mingw-w64-i686
- - gcc-mingw-w64
- - gcc-multilib
env:
- BUILD_DIR=win
- CFGOPT=--host=i686-w64-mingw32
@@ -234,6 +228,15 @@ matrix:
script:
- cmd.exe //C vcvarsall.bat x64 '&&' nmake 'OPTS=symbols' '-f' makefile.vc all tcltest
- cmd.exe //C vcvarsall.bat x64 '&&' nmake 'OPTS=symbols' '-f' makefile.vc test
+ - name: "Windows/MSVC/Mem-Debug"
+ os: windows
+ compiler: cl
+ env: *vcenv
+ before_install: *vcpreinst
+ install: []
+ script:
+ - cmd.exe //C vcvarsall.bat x64 '&&' nmake 'STATS=memdbg' '-f' makefile.vc all tcltest
+ - cmd.exe //C vcvarsall.bat x64 '&&' nmake 'STATS=memdbg' '-f' makefile.vc test
# Test on Windows with MSVC native (32-bit)
- name: "Windows/MSVC-x86/Shared"
os: windows
@@ -271,6 +274,15 @@ matrix:
script:
- cmd.exe //C vcvarsall.bat x86 '&&' nmake 'OPTS=symbols' '-f' makefile.vc all tcltest
- cmd.exe //C vcvarsall.bat x86 '&&' nmake 'OPTS=symbols' '-f' makefile.vc test
+ - name: "Windows/MSVC-x86/Mem-Debug"
+ os: windows
+ compiler: cl
+ env: *vcenv
+ before_install: *vcpreinst
+ install: []
+ script:
+ - cmd.exe //C vcvarsall.bat x86 '&&' nmake 'STATS=memdbg' '-f' makefile.vc all tcltest
+ - cmd.exe //C vcvarsall.bat x86 '&&' nmake 'STATS=memdbg' '-f' makefile.vc test
# Test on Windows with GCC native
- name: "Windows/GCC/Shared"
os: windows
@@ -279,7 +291,7 @@ matrix:
- BUILD_DIR=win
- CFGOPT="--enable-64bit"
before_install: &makepreinst
- - choco install make
+ - choco install -y make
- cd ${BUILD_DIR}
- name: "Windows/GCC/Shared: UTF_MAX=4"
os: windows
@@ -345,6 +357,13 @@ matrix:
- CFGOPT="--enable-symbols=mem"
before_install: *makepreinst
before_install:
+ - |-
+ case $TRAVIS_OS_NAME in
+ osx)
+ brew update
+ brew install libtommath
+ ;;
+ esac
- cd ${BUILD_DIR}
install:
- ./configure ${CFGOPT} --prefix=$HOME || (cat config.log && exit 1)