X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=.travis.yml;h=86a0dcbef5a48383c576d5ec2cbe21a5a5fc56b4;hp=82fada2c7666806118a263786c1d081473791e30;hb=53e409db615550c4bf5da2c9a5f56c7065315636;hpb=9cae86d56faec7bdbf97a5b241e53052adc535ce diff --git a/.travis.yml b/.travis.yml index 82fada2c76..86a0dcbef5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,28 +23,26 @@ compiler: - gcc env: - - CONFIG_OPTS="shared" - - CONFIG_OPTS="--debug --strict-warnings enable-crypto-mdebug enable-rc5 enable-md2" - - CONFIG_OPTS="" BUILDONLY="yes" - - CONFIG_OPTS="--classic" BUILDONLY="yes" - - CONFIG_OPTS="--classic shared" BUILDONLY="yes" - - CONFIG_OPTS="no-pic" BUILDONLY="yes" - - CONFIG_OPTS="no-engine" BUILDONLY="yes" + - CONFIG_OPTS="" + - CONFIG_OPTS="--debug no-shared enable-crypto-mdebug enable-rc5 enable-md2" + - CONFIG_OPTS="--strict-warnings no-shared" BUILDONLY="yes" + - CONFIG_OPTS="no-pic --strict-warnings" BUILDONLY="yes" + - CONFIG_OPTS="no-engine no-shared --strict-warnings" BUILDONLY="yes" matrix: include: - os: linux compiler: clang-3.6 - env: CONFIG_OPTS="-fsanitize=address" + env: CONFIG_OPTS="-fsanitize=address no-shared" - os: linux compiler: clang-3.6 - env: CONFIG_OPTS="no-asm --strict-warnings -fno-sanitize-recover -fsanitize=address -fsanitize=undefined enable-rc5 enable-md2" + env: CONFIG_OPTS="no-shared no-asm -fno-sanitize-recover -fsanitize=address -fsanitize=undefined enable-rc5 enable-md2 -fno-sanitize=alignment" - os: linux compiler: gcc-5 - env: CONFIG_OPTS="-fsanitize=address" + env: CONFIG_OPTS="no-shared -fsanitize=address" - os: linux compiler: gcc-5 - env: CONFIG_OPTS="no-asm --strict-warnings -fno-sanitize-recover -fsanitize=address -fsanitize=undefined enable-rc5 enable-md2" + env: CONFIG_OPTS="no-shared no-asm -fno-sanitize-recover -DPEDANTIC -fsanitize=address -fsanitize=undefined enable-rc5 enable-md2" - os: linux compiler: i686-w64-mingw32-gcc env: CONFIG_OPTS="no-pic" @@ -60,40 +58,32 @@ matrix: before_script: - sh .travis-create-release.sh $TRAVIS_OS_NAME - tar -xvzf _srcdist.tar.gz - - if echo "$CONFIG_OPTS" | grep "--unified" >/dev/null; then - srcdir=../_srcdir; - mkdir _build; - cd _build; - if which ccache >/dev/null; then - CC="ccache $CC"; - fi - else - srcdir=.; - cd _srcdist; - fi + - mkdir _build; + - cd _build; - if [ "$CC" == i686-w64-mingw32-gcc ]; then export CROSS_COMPILE=${CC%%gcc}; unset CC; - $srcdir/Configure mingw $CONFIG_OPTS -Wno-pedantic-ms-format; + ../_srcdist/Configure mingw $CONFIG_OPTS -Wno-pedantic-ms-format; elif [ "$CC" == x86_64-w64-mingw32-gcc ]; then export CROSS_COMPILE=${CC%%gcc}; unset CC; - $srcdir/Configure mingw64 $CONFIG_OPTS -Wno-pedantic-ms-format; + ../_srcdist/Configure mingw64 $CONFIG_OPTS -Wno-pedantic-ms-format; else - $srcdir/config $CONFIG_OPTS; + if which ccache >/dev/null && [ "$CC" != clang-3.6 ]; then + CC="ccache $CC"; + fi; + ../_srcdist/config $CONFIG_OPTS; fi - cd .. script: - - if echo "$CONFIG_OPTS" | grep "--unified" >/dev/null; then - cd _build; - else - cd _srcdist; - fi + - cd _build; - make - if [ -z "$BUILDONLY" ]; then if [ -n "$CROSS_COMPILE" ]; then export EXE_SHELL="wine" WINEPREFIX=`pwd`; fi; HARNESS_VERBOSE=yes make test; + else + make build_tests; fi - cd ..