[openssl-commits] [openssl] master update

[Emilia Kasper]

The branch master has been updated
       via  cec0a002ffebda5040f9a00ad0f67fbfad53b80f (commit)
       via  ad0a0a3a99828f1be722053ee6327813a6f6d789 (commit)
      from  3dc87806ce4517d58600b44975e14247cee1c807 (commit)


- Log -----------------------------------------------------------------
commit cec0a002ffebda5040f9a00ad0f67fbfad53b80f
Author: Emilia Kasper <emilia at openssl.org>
Date:   Fri Aug 5 11:33:48 2016 +0200

    Add --gcov-options '\-lp' to coverage
    
    Should result in more accurate header file coverage, see
    https://github.com/eddyxu/cpp-coveralls/issues/54
    
    Reviewed-by: Kurt Roeckx <kurt at openssl.org>

commit ad0a0a3a99828f1be722053ee6327813a6f6d789
Author: Emilia Kasper <emilia at openssl.org>
Date:   Wed Aug 3 15:29:21 2016 +0200

    Add a coverage target
    
    Run tests with coverage and report to coveralls.io
    
    For simplicity, this currently only adds a single target in a
    configuration that attempts to maximize coverage. The true CI coverage
    from all the various builds may be a little larger.
    
    The coverage run has the following configuration:
    - no-asm: since we can't track asm coverage anyway, might as well measure the
      non-asm code coverage.
    - Enable various disabled-by-default options:
      - rc5
      - md2
      - ec_nistp_64_gcc_128
      - ssl3
      - ssl3-method
      - weak-ssl-ciphers
    
    Finally, observe that no-pic implies no-shared, and therefore running
    both builds in the matrix is redundant.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Kurt Roeckx <kurt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 .travis.yml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index aee34cf..cd8589f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,9 @@
 language: c
 cache: ccache
 
+before_install:
+    - pip install --user cpp-coveralls
+
 addons:
     apt:
         packages:
@@ -25,13 +28,15 @@ compiler:
 env:
     - CONFIG_OPTS="" DESTDIR="_install"
     - CONFIG_OPTS="--debug no-shared enable-crypto-mdebug enable-rc5 enable-md2"
-    - CONFIG_OPTS="--strict-warnings no-shared" BUILDONLY="yes"
     - CONFIG_OPTS="no-pic --strict-warnings" BUILDONLY="yes"
     - CONFIG_OPTS="no-engine no-shared --strict-warnings" BUILDONLY="yes"
 
 matrix:
     include:
         - os: linux
+          compiler: gcc
+          env: CONFIG_OPTS="--debug --coverage no-asm enable-rc5 enable-md2 enable-ec_nistp_64_gcc_128 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers" COVERALLS="yes"
+        - os: linux
           compiler: clang-3.6
           env: CONFIG_OPTS="no-shared enable-asan"
         - os: linux
@@ -107,6 +112,11 @@ script:
       fi
     - cd $top
 
+after_success:
+    - if [ -n "$COVERALLS" ]; then
+          coveralls -b . --gcov-options '\-lp';
+      fi;
+
 notifications:
     email:
         - openssl-commits at openssl.org