Change names of ordinals and libs, libeay => libcrypto and ssleay => libssl

[openssl.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index cb23320d38b808af6444487c192ec5d772d109f7..198a12120843e83774f68d45d0e11ff282eb78f2 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,6 +27,7 @@ compiler:
 env:
     - CONFIG_OPTS=""
     - CONFIG_OPTS="shared"
 env:
     - CONFIG_OPTS=""
     - CONFIG_OPTS="shared"

+    - CONFIG_OPTS="no-pic"

     - CONFIG_OPTS="no-asm"
     - CONFIG_OPTS="--debug --strict-warnings enable-crypto-mdebug enable-rc5 enable-md2"
     - CONFIG_OPTS="--unified"
     - CONFIG_OPTS="no-asm"
     - CONFIG_OPTS="--debug --strict-warnings enable-crypto-mdebug enable-rc5 enable-md2"
     - CONFIG_OPTS="--unified"


@@ -41,16 +42,27 @@ matrix:
           env: CONFIG_OPTS="-fsanitize=address"
         - os: linux
           compiler: clang-3.6
           env: CONFIG_OPTS="-fsanitize=address"
         - os: linux
           compiler: clang-3.6

-          env: CONFIG_OPTS="no-asm --debug --strict-warnings -fno-sanitize-recover -fsanitize=address -fsanitize=undefined enable-crypto-mdebug enable-rc5 enable-md2"
+          env: CONFIG_OPTS="no-asm --strict-warnings -fno-sanitize-recover -fsanitize=address -fsanitize=undefined enable-crypto-mdebug enable-rc5 enable-md2"

         - os: linux
           compiler: gcc-5
           env: CONFIG_OPTS="-fsanitize=address"
         - os: linux
           compiler: gcc-5
         - os: linux
           compiler: gcc-5
           env: CONFIG_OPTS="-fsanitize=address"
         - os: linux
           compiler: gcc-5

-          env: CONFIG_OPTS="no-asm --debug --strict-warnings -fno-sanitize-recover -fsanitize=address -fsanitize=undefined enable-crypto-mdebug enable-rc5 enable-md2"
+          env: CONFIG_OPTS="no-asm --strict-warnings -fno-sanitize-recover -fsanitize=address -fsanitize=undefined enable-crypto-mdebug enable-rc5 enable-md2"
+        - os: linux
+          compiler: clang-3.6
+          env: CONFIG_OPTS="no-engine"
+        - os: linux
+          compiler: gcc
+          env: CONFIG_OPTS="no-engine"
+        - os: linux
+          compiler: gcc-5
+          env: CONFIG_OPTS="no-engine"

     exclude:
         - os: osx
           compiler: clang-3.6
     exclude:
         - os: osx
           compiler: clang-3.6

+        - os: osx
+          compiler: gcc

         - os: osx
           compiler: gcc-5
         - os: osx
         - os: osx
           compiler: gcc-5
         - os: osx


@@ -82,6 +94,12 @@ matrix:
           env: CONFIG_OPTS="--unified --debug --strict-warnings enable-crypto-mdebug enable-rc5 enable-md2"
         - compiler: x86_64-w64-mingw32-gcc
           env: CONFIG_OPTS="--unified --debug --strict-warnings enable-crypto-mdebug enable-rc5 enable-md2"
           env: CONFIG_OPTS="--unified --debug --strict-warnings enable-crypto-mdebug enable-rc5 enable-md2"
         - compiler: x86_64-w64-mingw32-gcc
           env: CONFIG_OPTS="--unified --debug --strict-warnings enable-crypto-mdebug enable-rc5 enable-md2"

+        - compiler: clang-3.6
+          env: CONFIG_OPTS="no-engine"
+        - compiler: gcc-5
+          env: CONFIG_OPTS="no-engine"
+        - compiler: gcc
+          env: CONFIG_OPTS="no-engine"

 
 before_script:
     - sh .travis-create-release.sh $TRAVIS_OS_NAME
 
 before_script:
     - sh .travis-create-release.sh $TRAVIS_OS_NAME


@@ -104,9 +122,10 @@ script:
     - if [ -n "$CROSS_COMPILE" ]; then
           export EXE_SHELL="wine" WINEPREFIX=`pwd`;
       fi
     - if [ -n "$CROSS_COMPILE" ]; then
           export EXE_SHELL="wine" WINEPREFIX=`pwd`;
       fi

-    - make test
+    - HARNESS_VERBOSE=yes make test

     - cd ..
 
 notifications:
     email:
         - openssl-commits@openssl.org
     - cd ..
 
 notifications:
     email:
         - openssl-commits@openssl.org

+