X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=.travis.yml;h=6c1b262522685e8ea2294cc0a097833aaec0d4d3;hb=473358581a544425bc3429cddad38874e19c9cfc;hp=8f023cffd21018103db0e4e080a6bc1462329fc6;hpb=97430ebfe8d60932f3da76e43fd8a297579f1030;p=openssl-gost%2Fengine.git

diff --git a/.travis.yml b/.travis.yml
index 8f023cf..6c1b262 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,22 +1,31 @@
 sudo: required
-dist: trusty
+dist: xenial
 
 os: linux
 
 language: c
 
+addons:
+  apt:
+    packages:
+    - cpanminus
+
 env:
   global:
     - PREFIX=${HOME}/opt
     - LD_LIBRARY_PATH=${PREFIX}/lib
     - PATH=${PREFIX}/bin:${PATH}
-    - OPENSSL_ENGINES=${TRAVIS_BUILD_DIR}/bin
 
 matrix:
   include:
     - env: OPENSSL_BRANCH=master
       os: linux
       compiler: gcc
+    - env:
+      - OPENSSL_BRANCH=master
+      - ASAN=-DASAN=1
+      os: linux
+      compiler: gcc
 #    - env: OPENSSL_BRANCH=OpenSSL_1_1_0-stable
 #      os: linux
 #      compiler: gcc
@@ -25,11 +34,15 @@ matrix:
 #      compiler: gcc
 
 before_script:
-  - git clone -b ${OPENSSL_BRANCH} https://github.com/openssl/openssl.git
+  - sudo cpanm --notest Test2::V0 > build.log 2>&1 || (cat build.log && exit 1)
+  - git clone --depth 1 -b ${OPENSSL_BRANCH} https://github.com/openssl/openssl.git
   - cd openssl
-  - ./config shared --prefix=${PREFIX} --openssldir=${PREFIX} && make all install_sw > build.log 2>&1 || (cat build.log && exit 1)
+  - ./config shared -d --prefix=${PREFIX} --openssldir=${PREFIX} && make -j$(nproc) all && make install_sw > build.log 2>&1 || (cat build.log && exit 1)
   - cd ..
 
 script:
-  - cmake -DOPENSSL_ROOT_DIR=${PREFIX} -DOPENSSL_LIBRARIES=${PREFIX}/lib && make
-  - make test
+  - mkdir build
+  - cd build
+  - cmake -DOPENSSL_ROOT_DIR=${PREFIX} -DOPENSSL_LIBRARIES=${PREFIX}/lib -DOPENSSL_ENGINES_DIR=${PREFIX}/engines ${ASAN} ..
+  - make
+  - make test CTEST_OUTPUT_ON_FAILURE=1