X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=.travis.yml;h=3096ae8136ad4b2cc80b43981ce5f99beab581df;hp=0586fb3e5159f282e98ce5aeb3b55980d29ba94a;hb=1518c55a796b058eff01f3cbf177f4b726c01d7c;hpb=a6da6b73ca480cfa6fe8d0a882f4ff549d46fcff diff --git a/.travis.yml b/.travis.yml index 0586fb3e51..3096ae8136 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,8 +29,8 @@ compiler: - gcc env: - - CONFIG_OPTS="" DESTDIR="_install" 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="" DESTDIR="_install" + - CONFIG_OPTS="no-asm -Werror --debug no-afalgeng no-shared enable-crypto-mdebug enable-rc5 enable-md2" - CONFIG_OPTS="no-asm --strict-warnings" BUILDONLY="yes" CHECKDOCS="yes" matrix: @@ -44,7 +44,7 @@ matrix: sources: - ubuntu-toolchain-r-test compiler: gcc-5 - env: CONFIG_OPTS="--strict-warnings" TESTS="-test_fuzz" COMMENT="Move to the BORINGTEST build when interoperable" + env: CONFIG_OPTS="--strict-warnings" COMMENT="Move to the BORINGTEST build when interoperable" - os: linux compiler: clang-3.9 env: CONFIG_OPTS="--strict-warnings no-deprecated" BUILDONLY="yes" @@ -102,7 +102,7 @@ matrix: - binutils-mingw-w64 - gcc-mingw-w64 compiler: i686-w64-mingw32-gcc - env: EXTENDED_TEST="yes" CONFIG_OPTS="no-pic" TESTS="-test_fuzz" + env: EXTENDED_TEST="yes" CONFIG_OPTS="no-pic" - os: linux addons: apt: @@ -110,7 +110,7 @@ matrix: - binutils-mingw-w64 - gcc-mingw-w64 compiler: x86_64-w64-mingw32-gcc - env: EXTENDED_TEST="yes" CONFIG_OPTS="no-pic" TESTS="-test_fuzz" + env: EXTENDED_TEST="yes" CONFIG_OPTS="no-pic" exclude: - os: linux compiler: clang @@ -124,7 +124,7 @@ before_script: fi - if [ -n "$DESTDIR" ]; then sh .travis-create-release.sh $TRAVIS_OS_NAME; - tar -xvzf _srcdist.tar.gz; + tar -xzf _srcdist.tar.gz; mkdir _build; cd _build; srcdir=../_srcdist; @@ -133,14 +133,14 @@ before_script: srcdir=.; top=.; fi - - if [ "$CC" == i686-w64-mingw32-gcc ]; then + - if [ "$CC" = i686-w64-mingw32-gcc ]; then export CROSS_COMPILE=${CC%%gcc}; unset CC; $srcdir/Configure mingw $CONFIG_OPTS -Wno-pedantic-ms-format; - elif [ "$CC" == x86_64-w64-mingw32-gcc ]; then + elif [ "$CC" = x86_64-w64-mingw32-gcc ]; then export CROSS_COMPILE=${CC%%gcc}; unset CC; $srcdir/Configure mingw64 $CONFIG_OPTS -Wno-pedantic-ms-format; else - if [ "$CC" == clang-3.9 ]; then + if [ "$CC" = clang-3.9 ]; then sudo cp .travis-apt-pin.preferences /etc/apt/preferences.d/no-ubuntu-clang; curl -sSL "http://apt.llvm.org/llvm-snapshot.gpg.key" | sudo -E apt-key add -; echo "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-3.9 main" | sudo tee -a /etc/apt/sources.list > /dev/null; @@ -199,18 +199,22 @@ script: echo -e '+\057\057\057\057 MAKE TEST FAILED'; false; fi; else - if $make build_tests; then + if $make build_tests >~/build.log 2>&1; then echo -e '+\057\057\057\057\057 MAKE BUILD_TESTS OK'; else - echo -e '+\057\057\057\057\057 MAKE BUILD_TESTS FAILED'; false; + echo -e '+\057\057\057\057\057 MAKE BUILD_TESTS FAILED'; + cat ~/build.log + false; fi; fi - if [ -n "$DESTDIR" ]; then mkdir "$top/$DESTDIR"; - if $make install install_docs DESTDIR="$top/$DESTDIR"; then + if $make install install_docs DESTDIR="$top/$DESTDIR" >~/install.log 2>&1 ; then echo -e '+\057\057\057\057\057\057 MAKE INSTALL OK'; else - echo -e '+\057\057\057\057\057\057 MAKE INSTALL FAILED'; false; + echo -e '+\057\057\057\057\057\057 MAKE INSTALL FAILED'; + cat ~/install.log; + false; fi; fi - cd $top