[openssl-commits] [openssl] master update
Andy Polyakov
appro at openssl.org
Fri Feb 24 15:07:20 UTC 2017
The branch master has been updated
via b169c0ec40408566270fb638bcbfab01a0d2dc60 (commit)
via 31c1db92c605c8c6615d5eed1b1e7ceb7073fc53 (commit)
from 01b76c2c5d4d786cfcb3cc048d9c0c47229a0aa0 (commit)
- Log -----------------------------------------------------------------
commit b169c0ec40408566270fb638bcbfab01a0d2dc60
Author: Andy Polyakov <appro at openssl.org>
Date: Mon Feb 6 11:14:05 2017 +0100
.travis.yml: introduce concept of "extended tests"
Since CI is engaged on per merge request basis, it can be wasteful to
run each request through all the tests, especially those resource
consuming. Idea is to mark most of tests as "extended" and provide a
way to opt-in by marking last commit with [extended tests] tag. It's
still not as optimal as one could wish, as decision to skip a test
still requires machine time, and it's taken in configured environment,
i.e. with updates and additional packages installed...
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2292)
commit 31c1db92c605c8c6615d5eed1b1e7ceb7073fc53
Author: Andy Polyakov <appro at openssl.org>
Date: Thu Jan 26 01:02:43 2017 +0100
.travis.yml: make package pulls conditional.
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2292)
-----------------------------------------------------------------------
Summary of changes:
.travis.yml | 111 +++++++++++++++++++++++++++++++++++++++++++++---------------
1 file changed, 84 insertions(+), 27 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 055b2f8..04a29f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,15 +10,7 @@ addons:
apt:
packages:
- ccache
- - clang-3.6
- - gcc-5
- - g++-5
- golang
- - binutils-mingw-w64
- - gcc-mingw-w64
- sources:
- - llvm-toolchain-precise-3.6
- - ubuntu-toolchain-r-test
os:
- linux
@@ -28,45 +20,106 @@ 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-shared enable-crypto-mdebug enable-rc5 enable-md2" TESTS="-test_fuzz"
+ - CONFIG_OPTS="no-asm --strict-warnings" BUILDONLY="yes" CHECKDOCS="yes"
matrix:
include:
- os: linux
+ addons:
+ apt:
+ packages:
+ - 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.6
+ sources:
+ - llvm-toolchain-precise-3.6
+ - ubuntu-toolchain-r-test
compiler: clang-3.6
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:
+ packages:
+ - gcc-5
+ - g++-5
+ 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-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"
- os: linux
+ addons:
+ apt:
+ packages:
+ - clang-3.6
+ sources:
+ - llvm-toolchain-precise-3.6
+ - ubuntu-toolchain-r-test
compiler: clang-3.6
- env: CONFIG_OPTS="enable-msan"
+ env: EXTENDED_TEST="yes" CONFIG_OPTS="enable-msan"
- os: linux
+ addons:
+ apt:
+ packages:
+ - clang-3.6
+ sources:
+ - llvm-toolchain-precise-3.6
+ - 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"
+ env: EXTENDED_TEST="yes" 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"
- os: linux
+ addons:
+ apt:
+ packages:
+ - clang-3.6
+ sources:
+ - llvm-toolchain-precise-3.6
+ - 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"
+ env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-asan enable-rc5 enable-md2 no-shared -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION"
- os: linux
+ addons:
+ apt:
+ packages:
+ - gcc-5
+ - g++-5
+ sources:
+ - ubuntu-toolchain-r-test
compiler: gcc-5
- env: CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 -DPEDANTIC"
- - os: linux
- 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 -DPEDANTIC"
- 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
- compiler: i686-w64-mingw32-gcc
- env: CONFIG_OPTS="no-pic"
+ env: EXTENDED_TEST="yes" CONFIG_OPTS="no-pic" TESTS="-test_fuzz"
- os: linux
+ addons:
+ apt:
+ packages:
+ - binutils-mingw-w64
+ - gcc-mingw-w64
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
@@ -74,6 +127,10 @@ matrix:
compiler: gcc
before_script:
+ - env
+ - if [ "$TRAVIS_EVENT_TYPE" == "pull_request" -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;
More information about the openssl-commits
mailing list