summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2019-07-24 07:59:28 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2019-07-24 07:59:28 (GMT)
commitbb0e258bba9de0be9568baf642416f1db0b0f797 (patch)
tree30f5ede3c0dc6bd71e530920ad962c45d7ff94b3 /.travis.yml
parentbc6c5be360c9d236084d33443998935290717431 (diff)
parenta31a6c46832853a417e8ffe0f48a8eabecbe29ae (diff)
downloadtcl-bb0e258bba9de0be9568baf642416f1db0b0f797.zip
tcl-bb0e258bba9de0be9568baf642416f1db0b0f797.tar.gz
tcl-bb0e258bba9de0be9568baf642416f1db0b0f797.tar.bz2
Merge 8.6
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml58
1 files changed, 30 insertions, 28 deletions
diff --git a/.travis.yml b/.travis.yml
index 5999c40..dff7580 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,19 +4,6 @@ language: c
matrix:
include:
# Testing on Linux with various compilers
- - name: "Linux/Clang/Shared"
- os: linux
- dist: xenial
- compiler: clang
- env:
- - BUILD_DIR=unix
- - name: "Linux/Clang/Static"
- os: linux
- dist: xenial
- compiler: clang
- env:
- - CFGOPT=--disable-shared
- - BUILD_DIR=unix
- name: "Linux/Clang/Shared: UTF_MAX=6"
os: linux
dist: xenial
@@ -80,16 +67,7 @@ matrix:
env:
- BUILD_DIR=unix
- CFGOPT=CFLAGS=-DTCL_NO_DEPRECATED=1
-# Debug builds. Running test-cases disabled, because it is currently failing.
- - name: "Linux/Clang/Debug/no test"
- os: linux
- dist: xenial
- compiler: clang
- env:
- - BUILD_DIR=unix
- - CFGOPT=--enable-symbols=all
- script:
- - make all tcltest
+# Debug build. Running test-cases disabled, because it is currently failing.
- name: "Linux/GCC/Debug/no test"
os: linux
dist: xenial
@@ -148,13 +126,37 @@ matrix:
- g++-4.9
env:
- BUILD_DIR=unix
+# Clang
+ - name: "Linux/Clang/Shared"
+ os: linux
+ dist: xenial
+ compiler: clang
+ env:
+ - BUILD_DIR=unix
+ - name: "Linux/Clang/Static"
+ os: linux
+ dist: xenial
+ compiler: clang
+ env:
+ - CFGOPT=--disable-shared
+ - BUILD_DIR=unix
+# Debug build. Running test-cases disabled, because it is currently failing.
+ - name: "Linux/Clang/Debug/no test"
+ os: linux
+ dist: xenial
+ compiler: clang
+ env:
+ - BUILD_DIR=unix
+ - CFGOPT=--enable-symbols=all
+ script:
+ - make all tcltest
# Testing on Mac, various styles
- name: "macOS/Xcode 11/Shared/Unix-like"
os: osx
osx_image: xcode11
env:
- BUILD_DIR=unix
- - name: "macOS/Xcode 11/Shared/Mac-like"
+ - name: "macOS/Xcode 11/Shared"
os: osx
osx_image: xcode11
env:
@@ -164,21 +166,21 @@ matrix:
- make all
# The styles=develop avoids some weird problems on OSX
- make test styles=develop
- - name: "macOS/Xcode 10/Shared/Mac-like"
+ - name: "macOS/Xcode 10/Shared"
os: osx
osx_image: xcode10.2
env:
- BUILD_DIR=macosx
install: []
script: *mactest
- - name: "macOS/Xcode 9/Shared/Mac-like"
+ - name: "macOS/Xcode 9/Shared"
os: osx
osx_image: xcode9
env:
- BUILD_DIR=macosx
install: []
script: *mactest
- - name: "macOS/Xcode 8/Shared/Mac-like"
+ - name: "macOS/Xcode 8/Shared"
os: osx
osx_image: xcode8
env:
@@ -204,7 +206,7 @@ matrix:
- BUILD_DIR=win
- CFGOPT=--host=i686-w64-mingw32
script: &crosstest
- - make all tcltest.exe
+ - make all tcltest
# Include a high visibility marker that tests are skipped outright
- >
echo "`tput setaf 3`SKIPPED TEST: CROSS COMPILING`tput sgr0`"