X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=.travis.yml;h=61a9acc3b3add1c3e3021f990a964d5fc248a080;hp=4eb5e606a4023a4e780e9f5f0bbee4ee8d1cb678;hb=bd79bcb42bab120575fc398692b7b61b1c5e6ed2;hpb=31c1db92c605c8c6615d5eed1b1e7ceb7073fc53 diff --git a/.travis.yml b/.travis.yml index 4eb5e606a4..61a9acc3b3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,16 +1,24 @@ +dist: trusty +sudo: required + language: c cache: ccache +git: + submodules: false before_install: - if [ -n "$COVERALLS" ]; then pip install --user cpp-coveralls; fi; + - if expr "$CONFIG_OPTS" ":" ".*enable-external-tests" > /dev/null; then + git submodule update --init --recursive; + fi; addons: apt: packages: - ccache - - golang + - golang-1.6 os: - linux @@ -20,12 +28,9 @@ compiler: - gcc env: - - CONFIG_OPTS="" DESTDIR="_install" - - CONFIG_OPTS="--debug no-shared enable-crypto-mdebug enable-rc5 enable-md2" - - CONFIG_OPTS="no-pic --strict-warnings" BUILDONLY="yes" CHECKDOCS="yes" - - CONFIG_OPTS="no-engine no-shared --strict-warnings" BUILDONLY="yes" - - CONFIG_OPTS="no-stdio --strict-warnings" BUILDONLY="yes" - - CONFIG_OPTS="no-ec" BUILDONLY="yes" + - CONFIG_OPTS="" DESTDIR="_install" TESTS="-test_fuzz" + - CONFIG_OPTS="no-asm -Werror --debug no-afalgeng no-shared enable-crypto-mdebug enable-rc5 enable-md2 enable-aria" TESTS="-test_fuzz" + - CONFIG_OPTS="no-asm --strict-warnings" BUILDONLY="yes" CHECKDOCS="yes" matrix: include: @@ -33,12 +38,30 @@ matrix: addons: apt: packages: - - clang-3.6 + - gcc-5 + - g++-5 + sources: + - ubuntu-toolchain-r-test + compiler: gcc-5 + env: CONFIG_OPTS="--strict-warnings enable-tls1_3" TESTS="-test_fuzz" COMMENT="Move to the BORINGTEST build when interoperable" + - os: linux + addons: + apt: + packages: + - clang-3.9 sources: - - llvm-toolchain-precise-3.6 + - llvm-toolchain-trusty-3.9 - ubuntu-toolchain-r-test - compiler: clang-3.6 + compiler: clang-3.9 env: CONFIG_OPTS="--strict-warnings no-deprecated" BUILDONLY="yes" + - os: linux + addons: + apt: + packages: + - binutils-mingw-w64 + - gcc-mingw-w64 + compiler: i686-w64-mingw32-gcc + env: CONFIG_OPTS="no-stdio" BUILDONLY="yes" - os: linux addons: apt: @@ -48,47 +71,47 @@ matrix: sources: - ubuntu-toolchain-r-test compiler: gcc-5 - env: CONFIG_OPTS="--debug --coverage no-asm enable-rc5 enable-md2 enable-ec_nistp_64_gcc_128 enable-ssl3 enable-ssl3-method enable-nextprotoneg enable-weak-ssl-ciphers enable-external-tests no-shared -DPEDANTIC -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" COVERALLS="yes" BORINGSSL_TESTS="yes" CXX="g++-5" + env: EXTENDED_TEST="yes" CONFIG_OPTS="--debug --coverage no-asm enable-rc5 enable-md2 enable-aria enable-ec_nistp_64_gcc_128 enable-ssl3 enable-ssl3-method enable-nextprotoneg enable-weak-ssl-ciphers no-shared -DPEDANTIC -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" COVERALLS="yes" BORINGSSL_TESTS="yes" CXX="g++-5" - os: linux addons: apt: packages: - - clang-3.6 + - gcc-5 + - g++-5 sources: - - llvm-toolchain-precise-3.6 - ubuntu-toolchain-r-test - compiler: clang-3.6 - env: CONFIG_OPTS="enable-msan" + compiler: gcc-5 + env: EXTENDED_TEST="yes" CONFIG_OPTS="--debug enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers enable-external-tests" BORINGSSL_TESTS="yes" CXX="g++-5" TESTS=95 - os: linux addons: apt: packages: - - clang-3.6 + - clang-3.9 sources: - - llvm-toolchain-precise-3.6 + - llvm-toolchain-trusty-3.9 - ubuntu-toolchain-r-test - compiler: clang-3.6 - env: 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" + compiler: clang-3.9 + env: EXTENDED_TEST="yes" CONFIG_OPTS="enable-msan" - os: linux addons: apt: packages: - - clang-3.6 + - clang-3.9 sources: - - llvm-toolchain-precise-3.6 + - llvm-toolchain-trusty-3.9 - ubuntu-toolchain-r-test - compiler: clang-3.6 - env: CONFIG_OPTS="no-asm enable-asan enable-rc5 enable-md2 no-shared -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" + compiler: clang-3.9 + env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 enable-aria enable-ssl3 enable-ssl3-method enable-nextprotoneg -fno-sanitize=alignment no-shared -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" - os: linux addons: apt: packages: - - gcc-5 - - g++-5 + - clang-3.9 sources: + - llvm-toolchain-trusty-3.9 - ubuntu-toolchain-r-test - compiler: gcc-5 - env: CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 -DPEDANTIC" + compiler: clang-3.9 + env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-asan enable-rc5 enable-md2 enable-aria no-shared -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" - os: linux addons: apt: @@ -98,7 +121,7 @@ matrix: sources: - ubuntu-toolchain-r-test compiler: gcc-5 - env: CONFIG_OPTS="--strict-warnings enable-tls1_3" COMMENT="Move to the BORINGTEST build when interoperable" + env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 enable-aria -DPEDANTIC" - os: linux addons: apt: @@ -106,25 +129,15 @@ matrix: - binutils-mingw-w64 - gcc-mingw-w64 compiler: i686-w64-mingw32-gcc - env: CONFIG_OPTS="no-stdio" BUILDONLY="yes" + env: EXTENDED_TEST="yes" CONFIG_OPTS="no-pic" TESTS="-test_fuzz" - os: linux addons: apt: packages: - binutils-mingw-w64 - gcc-mingw-w64 - - wine - compiler: i686-w64-mingw32-gcc - env: CONFIG_OPTS="no-pic" - - os: linux - addons: - apt: - packages: - - binutils-mingw-w64 - - gcc-mingw-w64 - - wine compiler: x86_64-w64-mingw32-gcc - env: CONFIG_OPTS="no-pic" + env: EXTENDED_TEST="yes" CONFIG_OPTS="no-pic" TESTS="-test_fuzz" exclude: - os: linux compiler: clang @@ -132,6 +145,10 @@ matrix: compiler: gcc before_script: + - env + - if [ "$TRAVIS_PULL_REQUEST" != "false" -a -n "$EXTENDED_TEST" ]; then + (git log -1 $TRAVIS_COMMIT_RANGE | grep '\[extended tests\]' > /dev/null) || exit 0; + fi - if [ -n "$DESTDIR" ]; then sh .travis-create-release.sh $TRAVIS_OS_NAME; tar -xvzf _srcdist.tar.gz; @@ -150,7 +167,7 @@ before_script: export CROSS_COMPILE=${CC%%gcc}; unset CC; $srcdir/Configure mingw64 $CONFIG_OPTS -Wno-pedantic-ms-format; else - if which ccache >/dev/null && [ "$CC" != clang-3.6 ]; then + if which ccache >/dev/null && [ "$CC" != clang-3.9 ]; then CC="ccache $CC"; fi; $srcdir/config -v $CONFIG_OPTS; @@ -174,8 +191,14 @@ script: - $make - if [ -z "$BUILDONLY" ]; 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; export EXE_SHELL="wine" WINEPREFIX=`pwd`; fi; + if [ -e krb5/src ]; then + sudo apt-get -yq install bison dejagnu gettext keyutils ldap-utils libldap2-dev libkeyutils-dev python-cjson python-paste python-pyrad slapd tcl-dev tcsh; + fi; HARNESS_VERBOSE=yes BORING_RUNNER_DIR=$top/boringssl/ssl/test/runner make test; else $make build_tests;