提交 703324a7 编写于 作者: E Emilia Kasper

Update master Travis to Trusty

This gets us a newer Clang, and newer Go.
1.1.0 already runs on Trusty without issues.

To do this, we need to disable afalgeng in the -Werror build.

afalgeng isn't compatible with the -Werror build on
Travis Trusty due to kernel header mismatch.

(See also 97043e46)
Reviewed-by: NRichard Levitte <levitte@openssl.org>
上级 96a5d7fd
dist: trusty
sudo: required
language: c language: c
cache: ccache cache: ccache
...@@ -10,7 +13,7 @@ addons: ...@@ -10,7 +13,7 @@ addons:
apt: apt:
packages: packages:
- ccache - ccache
- golang - golang-1.6
os: os:
- linux - linux
...@@ -21,7 +24,7 @@ compiler: ...@@ -21,7 +24,7 @@ compiler:
env: env:
- CONFIG_OPTS="" DESTDIR="_install" TESTS="-test_fuzz" - CONFIG_OPTS="" DESTDIR="_install" TESTS="-test_fuzz"
- CONFIG_OPTS="no-asm -Werror --debug no-shared enable-crypto-mdebug enable-rc5 enable-md2" TESTS="-test_fuzz" - CONFIG_OPTS="no-asm -Werror --debug no-afalgeng no-shared enable-crypto-mdebug enable-rc5 enable-md2" TESTS="-test_fuzz"
- CONFIG_OPTS="no-asm --strict-warnings" BUILDONLY="yes" CHECKDOCS="yes" - CONFIG_OPTS="no-asm --strict-warnings" BUILDONLY="yes" CHECKDOCS="yes"
matrix: matrix:
...@@ -40,11 +43,11 @@ matrix: ...@@ -40,11 +43,11 @@ matrix:
addons: addons:
apt: apt:
packages: packages:
- clang-3.6 - clang-3.9
sources: sources:
- llvm-toolchain-precise-3.6 - llvm-toolchain-trusty-3.9
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
compiler: clang-3.6 compiler: clang-3.9
env: CONFIG_OPTS="--strict-warnings no-deprecated" BUILDONLY="yes" env: CONFIG_OPTS="--strict-warnings no-deprecated" BUILDONLY="yes"
- os: linux - os: linux
addons: addons:
...@@ -68,31 +71,31 @@ matrix: ...@@ -68,31 +71,31 @@ matrix:
addons: addons:
apt: apt:
packages: packages:
- clang-3.6 - clang-3.9
sources: sources:
- llvm-toolchain-precise-3.6 - llvm-toolchain-trusty-3.9
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
compiler: clang-3.6 compiler: clang-3.9
env: EXTENDED_TEST="yes" CONFIG_OPTS="enable-msan" env: EXTENDED_TEST="yes" CONFIG_OPTS="enable-msan"
- os: linux - os: linux
addons: addons:
apt: apt:
packages: packages:
- clang-3.6 - clang-3.9
sources: sources:
- llvm-toolchain-precise-3.6 - llvm-toolchain-trusty-3.9
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
compiler: clang-3.6 compiler: clang-3.9
env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 enable-ssl3 enable-ssl3-method enable-nextprotoneg -fno-sanitize=alignment no-shared -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 enable-ssl3 enable-ssl3-method enable-nextprotoneg -fno-sanitize=alignment no-shared -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION"
- os: linux - os: linux
addons: addons:
apt: apt:
packages: packages:
- clang-3.6 - clang-3.9
sources: sources:
- llvm-toolchain-precise-3.6 - llvm-toolchain-trusty-3.9
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
compiler: clang-3.6 compiler: clang-3.9
env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-asan enable-rc5 enable-md2 no-shared -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-asan enable-rc5 enable-md2 no-shared -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION"
- os: linux - os: linux
addons: addons:
...@@ -149,7 +152,7 @@ before_script: ...@@ -149,7 +152,7 @@ before_script:
export CROSS_COMPILE=${CC%%gcc}; unset CC; export CROSS_COMPILE=${CC%%gcc}; unset CC;
$srcdir/Configure mingw64 $CONFIG_OPTS -Wno-pedantic-ms-format; $srcdir/Configure mingw64 $CONFIG_OPTS -Wno-pedantic-ms-format;
else else
if which ccache >/dev/null && [ "$CC" != clang-3.6 ]; then if which ccache >/dev/null && [ "$CC" != clang-3.9 ]; then
CC="ccache $CC"; CC="ccache $CC";
fi; fi;
$srcdir/config -v $CONFIG_OPTS; $srcdir/config -v $CONFIG_OPTS;
...@@ -173,6 +176,8 @@ script: ...@@ -173,6 +176,8 @@ script:
- $make - $make
- if [ -z "$BUILDONLY" ]; then - if [ -z "$BUILDONLY" ]; then
if [ -n "$CROSS_COMPILE" ]; then if [ -n "$CROSS_COMPILE" ]; then
sudo dpkg --add-architecture i386;
sudo apt-get update;
sudo apt-get -yq --no-install-suggests --no-install-recommends --force-yes install wine; sudo apt-get -yq --no-install-suggests --no-install-recommends --force-yes install wine;
export EXE_SHELL="wine" WINEPREFIX=`pwd`; export EXE_SHELL="wine" WINEPREFIX=`pwd`;
fi; fi;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册