X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=.travis.yml;h=62675da0391569d64fa7a07b24a842352f46dbb8;hp=c642319d26f5a8200b34c540922a330c2a97467e;hb=bdcd660e33710079b495cf5cc6a1aaa5d2dcd317;hpb=210efa8badbd5365e1aec3f901c396434ae605be diff --git a/.travis.yml b/.travis.yml index c642319d26..62675da039 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,10 @@ language: c +cache: ccache addons: apt: packages: + - ccache - clang-3.6 - gcc-5 - binutils-mingw-w64 @@ -22,12 +24,12 @@ compiler: env: - CONFIG_OPTS="shared" - - CONFIG_OPTS="--debug --strict-warnings enable-crypto-mdebug enable-rc5 enable-md2" - - CONFIG_OPTS="" BUILDONLY="yes" - - CONFIG_OPTS="--unified" BUILDONLY="yes" - - CONFIG_OPTS="--unified shared" BUILDONLY="yes" - - CONFIG_OPTS="no-pic" BUILDONLY="yes" - - CONFIG_OPTS="no-engine" BUILDONLY="yes" + - CONFIG_OPTS="--debug enable-crypto-mdebug enable-rc5 enable-md2" + - CONFIG_OPTS="--strict-warnings" BUILDONLY="yes" + - CONFIG_OPTS="--classic" BUILDONLY="yes" + - CONFIG_OPTS="--classic shared" BUILDONLY="yes" + - CONFIG_OPTS="no-pic --strict-warnings" BUILDONLY="yes" + - CONFIG_OPTS="no-engine --strict-warnings" BUILDONLY="yes" matrix: include: @@ -36,13 +38,13 @@ matrix: env: CONFIG_OPTS="-fsanitize=address" - 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-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" - 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-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" @@ -58,26 +60,42 @@ matrix: before_script: - sh .travis-create-release.sh $TRAVIS_OS_NAME - tar -xvzf _srcdist.tar.gz - - cd _srcdist + - if echo "$CONFIG_OPTS" | grep -e "--classic" >/dev/null; then + srcdir=.; + cd _srcdist; + else + srcdir=../_srcdist; + mkdir _build; + cd _build; + fi - if [ "$CC" == i686-w64-mingw32-gcc ]; then export CROSS_COMPILE=${CC%%gcc}; unset CC; - ./Configure mingw $CONFIG_OPTS -Wno-pedantic-ms-format; + $srcdir/Configure mingw $CONFIG_OPTS -Wno-pedantic-ms-format; elif [ "$CC" == x86_64-w64-mingw32-gcc ]; then export CROSS_COMPILE=${CC%%gcc}; unset CC; - ./Configure mingw64 $CONFIG_OPTS -Wno-pedantic-ms-format; + $srcdir/Configure mingw64 $CONFIG_OPTS -Wno-pedantic-ms-format; else - ./config $CONFIG_OPTS; + if which ccache >/dev/null && [ "$CC" != clang-3.6 ]; then + CC="ccache $CC"; + fi; + $srcdir/config $CONFIG_OPTS; fi - cd .. script: - - cd _srcdist + - if echo "$CONFIG_OPTS" | grep -e "--classic" >/dev/null; then + cd _srcdist; + else + cd _build; + fi - 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 ..