X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=.travis.yml;h=2949dc05d6ea6b71c775210ee4ab30ccc98f758c;hb=38ce652a600ca43db4996f3c2945aff39a323e36;hp=b3d8ad107d9cdc81acd1a8f1c3d293a1620c1350;hpb=0f4c57408321d40b7c812969997fc923e138414b;p=openssl-gost%2Fengine.git

diff --git a/.travis.yml b/.travis.yml
index b3d8ad1..2949dc0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,31 +5,44 @@ 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=OpenSSL_1_1_0-stable
+    - env:
+      - OPENSSL_BRANCH=master
+      - ASAN=-DASAN=1
       os: linux
       compiler: gcc
+#    - env: OPENSSL_BRANCH=OpenSSL_1_1_0-stable
+#      os: linux
+#      compiler: gcc
 #    - env: OPENSSL_BRANCH=OpenSSL_1_0_2-stable
 #      os: linux
 #      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
-  - prove -v test/{00-engine.t,01-digest.t,02-mac.t,03-encrypt.t}
+  - 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