summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorAlessandro Ghedini <alessandro@ghedini.me>2015-10-07 16:40:37 -0400
committerRich Salz <rsalz@openssl.org>2015-10-07 16:42:42 -0400
commitbb7b893d7c36803d8c5d4ca82a5a037c5fc111b9 (patch)
treea42c4f332334b5713114cc7c2d19e7b68a221bde /.travis.yml
parentcc1cdc5df5e80883de20d6f59ecfc4505bbb3e52 (diff)
Fix travis 1.0.2 builds
Disable -Wshadow error when building with GCC Add support for linu-x86_64-clang debug; this is needed for Travis CI. Disable linux-clang and mingw debug builds on Travis CI; not supported. Fix Travis email notifications config Signed-off-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml12
1 files changed, 8 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 3125363cdf..b88eb3a188 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,6 +26,10 @@ matrix:
compiler: i686-w64-mingw32-gcc
- os: osx
compiler: x86_64-w64-mingw32-gcc
+ - compiler: i686-w64-mingw32-gcc
+ env: CONFIG_OPTS="-d --strict-warnings"
+ - compiler: x86_64-w64-mingw32-gcc
+ env: CONFIG_OPTS="-d --strict-warnings"
before_script:
- if [ "$CC" == i686-w64-mingw32-gcc ]; then
@@ -35,6 +39,9 @@ before_script:
export CROSS_COMPILE=${CC%%gcc}; unset CC;
./Configure mingw64 $CONFIG_OPTS;
else
+ if [ "$CC" == gcc ]; then
+ export CONFIG_OPTS="$CONFIG_OPTS -Wno-error=shadow";
+ fi;
./config $CONFIG_OPTS;
fi
@@ -43,8 +50,5 @@ script:
- if [ -z "$CROSS_COMPILE" ]; then make test; fi
notifications:
- recipient:
- - openssl-commits@openssl.org
email:
- on_success: change
- on_failure: always
+ - openssl-commits@openssl.org