X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=.travis.yml;h=d5147f181c9b034a7fde25c9449db271d9b2f2e3;hp=3096ae8136ad4b2cc80b43981ce5f99beab581df;hb=8c8fbca92dc95bb8672dea194bbe414059a874d2;hpb=5d322036b4afbd16afa2714539cf3f85eb7669c2 diff --git a/.travis.yml b/.travis.yml index 3096ae8136..d5147f181c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,8 @@ dist: trusty sudo: required +osx_image: xcode9.3 + language: c cache: ccache git: @@ -14,12 +16,6 @@ before_install: git submodule update --init --recursive; fi; -addons: - apt: - packages: - - ccache - - golang-1.6 - os: - linux - osx @@ -31,7 +27,7 @@ compiler: env: - 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" + - CONFIG_OPTS="no-asm no-makedepend --strict-warnings" BUILDONLY="yes" CHECKDOCS="yes" GENERATE="yes" matrix: include: @@ -46,8 +42,8 @@ matrix: compiler: gcc-5 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" + compiler: clang + env: CONFIG_OPTS="--strict-warnings -D__NO_STRING_INLINES no-deprecated" BUILDONLY="yes" - os: linux addons: apt: @@ -62,6 +58,7 @@ matrix: packages: - gcc-5 - g++-5 + - golang-1.6 sources: - ubuntu-toolchain-r-test compiler: gcc-5 @@ -72,29 +69,30 @@ matrix: packages: - gcc-5 - g++-5 + - golang-1.6 sources: - ubuntu-toolchain-r-test compiler: gcc-5 env: EXTENDED_TEST="yes" CONFIG_OPTS="--debug enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers enable-external-tests" BORINGSSL_TESTS="yes" CXX="g++-5" TESTS=95 - os: linux - compiler: clang-3.9 - env: EXTENDED_TEST="yes" CONFIG_OPTS="enable-msan" - - os: linux - compiler: clang-3.9 - 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" + compiler: clang + env: EXTENDED_TEST="yes" CONFIG_OPTS="enable-msan -D__NO_STRING_INLINES -Wno-unused-command-line-argument" - os: linux - compiler: clang-3.9 - env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-asan enable-rc5 enable-md2 no-shared -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" + 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 -fno-sanitize=alignment -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -D__NO_STRING_INLINES -Wno-unused-command-line-argument" - os: linux - addons: - apt: - packages: - - gcc-5 - - g++-5 - sources: - - ubuntu-toolchain-r-test - compiler: gcc-5 - env: EXTENDED_TEST="yes" CONFIG_OPTS="--debug no-asm enable-ubsan enable-rc5 enable-md2 -DPEDANTIC" OPENSSL_TEST_RAND_ORDER=0 + 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 + # addons: + # apt: + # packages: + # - gcc-5 + # - g++-5 + # sources: + # - ubuntu-toolchain-r-test + # compiler: gcc-5 + # env: EXTENDED_TEST="yes" CONFIG_OPTS="--debug no-asm enable-ubsan enable-rc5 enable-md2 -DPEDANTIC" OPENSSL_TEST_RAND_ORDER=0 - os: linux addons: apt: @@ -161,6 +159,11 @@ script: else make="make"; fi + - if [ -n "$GENERATE" ]; then + make2="$make PERL=no-perl"; + else + make2="$make"; + fi - top=${PWD} - if [ -n "$DESTDIR" ]; then cd _build; @@ -178,10 +181,17 @@ script: echo -e '+\057\057 MAKE DOC-NITS FAILED'; false; fi; fi - - if $make; then - echo -e '+\057\057\057 MAKE OK'; + - if [ -n "$GENERATE" ]; then + if $make build_all_generated; then + echo -e '+\057\057\057 MAKE BUILD_ALL_GENERATED OK'; + else + echo -e '+\057\057\057 MAKE BUILD_ALL_GENERATED FAILED'; false; + fi; + fi + - if $make2; then + echo -e '+\057\057\057\057 MAKE OK'; else - echo -e '+\057\057\057 MAKE FAILED'; false; + echo -e '+\057\057\057\057 MAKE FAILED'; false; fi; - if [ -z "$BUILDONLY" ]; then if [ -n "$CROSS_COMPILE" ]; then @@ -194,15 +204,15 @@ script: sudo apt-get -yq install bison dejagnu gettext keyutils ldap-utils libldap2-dev libkeyutils-dev python-cjson python-paste python-pyrad slapd tcl-dev tcsh; fi; if HARNESS_VERBOSE=yes BORING_RUNNER_DIR=$top/boringssl/ssl/test/runner make test; then - echo -e '+\057\057\057\057 MAKE TEST OK'; + echo -e '+\057\057\057\057\057 MAKE TEST OK'; else - echo -e '+\057\057\057\057 MAKE TEST FAILED'; false; + echo -e '+\057\057\057\057\057 MAKE TEST FAILED'; false; fi; else if $make build_tests >~/build.log 2>&1; then - echo -e '+\057\057\057\057\057 MAKE BUILD_TESTS OK'; + echo -e '+\057\057\057\057\057\057 MAKE BUILD_TESTS OK'; else - echo -e '+\057\057\057\057\057 MAKE BUILD_TESTS FAILED'; + echo -e '+\057\057\057\057\057\057 MAKE BUILD_TESTS FAILED'; cat ~/build.log false; fi; @@ -210,9 +220,9 @@ script: - if [ -n "$DESTDIR" ]; then mkdir "$top/$DESTDIR"; if $make install install_docs DESTDIR="$top/$DESTDIR" >~/install.log 2>&1 ; then - echo -e '+\057\057\057\057\057\057 MAKE INSTALL OK'; + echo -e '+\057\057\057\057\057\057\057 MAKE INSTALL OK'; else - echo -e '+\057\057\057\057\057\057 MAKE INSTALL FAILED'; + echo -e '+\057\057\057\057\057\057\057 MAKE INSTALL FAILED'; cat ~/install.log; false; fi;