X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=.travis.yml;h=7256b3bccb9c18ab89d47bbdba703da767789c1a;hb=ef077ba0d2fa28fd1b481f80335bda723d3d1f20;hp=9f616c7e00f2c62e6b4d6fe09046f98020d8f64e;hpb=c89799605b833f769ce4cfd879bb291f49b133be;p=oweals%2Fopenssl.git diff --git a/.travis.yml b/.travis.yml index 9f616c7e00..7256b3bccb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,11 @@ before_install: - if expr "$CONFIG_OPTS" ":" ".*enable-external-tests" > /dev/null; then git submodule update --init --recursive; fi; + - eval "${MATRIX_EVAL}" + +arch: + - amd64 + - arm64 os: - linux @@ -27,13 +32,35 @@ compiler: env: - CONFIG_OPTS="" DESTDIR="_install" - - CONFIG_OPTS="no-asm -Werror --debug no-afalgeng no-shared enable-crypto-mdebug enable-rc5 enable-md2" + # Note: This CONFIG_OPTS entry must match the value in the exclude: table below that contains env: CONFIG_OPTS , otherwise it will not find a match. + - CONFIG_OPTS="no-asm -Werror --debug no-afalgeng no-shared enable-rc5 enable-md2 -fsanitize=address" LSAN_OPTIONS="report_objects=1" - CONFIG_OPTS="no-asm no-makedepend enable-buildtest-c++ --strict-warnings -D_DEFAULT_SOURCE" BUILDONLY="yes" CHECKDOCS="yes" GENERATE="yes" CPPFLAGS="-ansi" matrix: include: - os: linux arch: arm64 + dist: bionic + compiler: clang + env: CONFIG_OPTS="--strict-warnings -D__NO_STRING_INLINES no-deprecated" BUILDONLY="yes" + - os: linux + arch: arm64 + compiler: clang + addons: + apt: + packages: + - clang-6.0 + env: EXTENDED_TEST="yes" CONFIG_OPTS="enable-msan disable-afalgeng -D__NO_STRING_INLINES -Wno-unused-command-line-argument" MATRIX_EVAL="CC=clang-6.0 && CXX=clang++-6.0" + - os: linux + arch: arm64 + compiler: clang + addons: + apt: + packages: + - clang-6.0 + env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 enable-ssl3 enable-ssl3-method enable-nextprotoneg no-shared enable-buildtest-c++ -fno-sanitize=alignment -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -D__NO_STRING_INLINES -Wno-unused-command-line-argument" MATRIX_EVAL="CC=clang-6.0 && CXX=clang++-6.0" + - os: linux + arch: s390x compiler: gcc env: CONFIG_OPTS="--strict-warnings" - os: linux-ppc64le @@ -78,16 +105,18 @@ matrix: packages: - golang-1.10 compiler: gcc - env: EXTENDED_TEST="yes" CONFIG_OPTS="--debug enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers enable-external-tests enable-buildtest-c++" BORINGSSL_TESTS="yes" CXX="g++" TESTS=95 + # External test pyca-cryptography temporarily disabled due to long term travis failures + env: EXTENDED_TEST="yes" CONFIG_OPTS="--debug enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers enable-external-tests enable-buildtest-c++" BORINGSSL_TESTS="yes" CXX="g++" TESTS="test_external_boringssl test_external_krb5" - os: linux compiler: clang env: EXTENDED_TEST="yes" CONFIG_OPTS="enable-msan disable-afalgeng -D__NO_STRING_INLINES -Wno-unused-command-line-argument" - os: linux compiler: clang env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 enable-ssl3 enable-ssl3-method enable-nextprotoneg no-shared enable-buildtest-c++ -fno-sanitize=alignment -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -D__NO_STRING_INLINES -Wno-unused-command-line-argument" CXX="clang++" - - os: linux - compiler: clang - env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-asan enable-rc5 enable-md2 no-shared -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -D__NO_STRING_INLINES -Wno-unused-command-line-argument" +#Temporarily removed because memleak test fails for unknown reasons in this build. Other builds with memleak testing ("-fsanitize=address") are passing. +# - os: linux +# compiler: clang +# env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-asan enable-rc5 enable-md2 no-shared -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -D__NO_STRING_INLINES -Wno-unused-command-line-argument" - os: linux compiler: gcc env: EXTENDED_TEST="yes" CONFIG_OPTS="--debug no-asm enable-ubsan enable-rc5 enable-md2 enable-buildtest-c++ -DPEDANTIC" OPENSSL_TEST_RAND_ORDER=0 @@ -122,11 +151,21 @@ matrix: compiler: clang - os: osx compiler: gcc + - arch: arm64 + os: osx + # arm64 times out when using -fsanitize=address + # The amd64 build should be sufficient to test this. + # Note: the env line must exactly match the env line from the build + # matrix above which contains the `-fsanitize=address` option. + # TODO: come up with a better way of doing this that is less error prone. + - arch: arm64 + env: CONFIG_OPTS="no-asm -Werror --debug no-afalgeng no-shared enable-rc5 enable-md2 -fsanitize=address" LSAN_OPTIONS="report_objects=1" + 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; + (git log -1 $TRAVIS_COMMIT_RANGE | grep '\[extended tests\]' > /dev/null) || travis_terminate 0; fi - if [ -n "$DESTDIR" ]; then sh .travis-create-release.sh $TRAVIS_OS_NAME; @@ -174,17 +213,17 @@ script: travis_terminate 1; fi - if ! git diff --exit-code; then - echo -e '\052\052 FAILED -- UPDATED FILES NOT COMMITED'; - travis_terminate 1; - fi - - if test -n "$CHECKDOCS" && ! $make doc-nits; then - echo -e '\052\052 FAILED -- MAKE DOC-NITS'; + echo -e '\052\052 FAILED -- UPDATED FILES NOT COMMITTED'; travis_terminate 1; fi - if test -n "$GENERATE" && ! $make build_all_generated; then echo -e '\052\052 FAILED -- MAKE BUILD_ALL_GENERATED'; travis_terminate 1; fi + - if test -n "$CHECKDOCS" && ! $make doc-nits; then + echo -e '\052\052 FAILED -- MAKE DOC-NITS'; + travis_terminate 1; + fi - if ! $make2; then echo -e '\052\052 FAILED -- MAKE'; travis_terminate 1;