From 7ac41a5ca6e9d4b63e6e0d2570043ece7c5a68cb Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 14 Apr 2017 13:16:47 +0800 Subject: [PATCH] Update .travis.yml --- .travis.yml | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/.travis.yml b/.travis.yml index 80d82143..4831419b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,9 +33,6 @@ env: 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; @@ -47,18 +44,6 @@ before_script: srcdir=.; top=.; fi - - 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 - 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.9 ]; then - CC="ccache $CC"; - fi; - $srcdir/config -v $CONFIG_OPTS; - fi - cd $top script: @@ -72,17 +57,7 @@ script: cd _build; fi - $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; - HARNESS_VERBOSE=yes BORING_RUNNER_DIR=$top/boringssl/ssl/test/runner make test; - else - $make tests; - fi + - $make tests; - if [ -n "$DESTDIR" ]; then mkdir "$top/$DESTDIR"; $make install install_docs DESTDIR="$top/$DESTDIR";