summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorAlessandro Ghedini <alessandro@ghedini.me>2015-10-12 16:15:43 -0400
committerRich Salz <rsalz@openssl.org>2015-10-13 14:04:53 -0400
commitf386742cfb811a9d2c886240e90b1064511b9acf (patch)
treef9292f797a3526a8ce4ffa2e3e728db67115df4b /.travis.yml
parent2d2a83543f757cf3a48a1a0e412aee183a6d539b (diff)
GH429: Add clang to travis
Signed-off-by: Rich Salz <rsalz@akamai.com> Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml17
1 files changed, 14 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index c923119922..f27b4b635a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,13 @@
language: c
addons:
- apt_packages:
- - binutils-mingw-w64
- - gcc-mingw-w64
+ apt:
+ packages:
+ - gcc-5
+ - binutils-mingw-w64
+ - gcc-mingw-w64
+ sources:
+ - ubuntu-toolchain-r-test
os:
- linux
@@ -12,6 +16,7 @@ os:
compiler:
- clang
- gcc
+ - gcc-5
- i686-w64-mingw32-gcc
- x86_64-w64-mingw32-gcc
@@ -21,8 +26,14 @@ env:
- CONFIG_OPTS="--debug --strict-warnings"
matrix:
+ include:
+ - os: linux
+ compiler: gcc-5
+ env: CONFIG_OPTS="--debug --strict-warnings -fsanitize=address"
exclude:
- os: osx
+ compiler: gcc-5
+ - os: osx
compiler: i686-w64-mingw32-gcc
- os: osx
compiler: x86_64-w64-mingw32-gcc