X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=.travis.yml;h=b3c120f1bdb0d68cc7e3ce346f51587da7e50e33;hb=refs%2Fheads%2Fmgm_impl;hp=e9c90be3eb14a4f077985ce87684f896c57e8024;hpb=1b64cb921e3100f76c164a482dfc3396b022be4c;p=openssl-gost%2Fengine.git

diff --git a/.travis.yml b/.travis.yml
index e9c90be..b3c120f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,35 +1,46 @@
 sudo: required
-dist: trusty
+dist: xenial
 
 os: linux
 
 language: c
 
+addons:
+  apt:
+    packages: [ cpanminus ]
+  homebrew:
+    packages: [ cpanminus ]
+
 env:
   global:
     - PREFIX=${HOME}/opt
-    - LD_LIBRARY_PATH=${PREFIX}/lib
     - PATH=${PREFIX}/bin:${PATH}
-    - OPENSSL_ENGINES=${TRAVIS_BUILD_DIR}/bin
+    - OPENSSL_BRANCH=master
 
 matrix:
   include:
-    - env: OPENSSL_BRANCH=master
+    - os: linux
+      compiler: gcc
+    - env: 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
+    - os: osx
+      compiler: clang
+
 
 before_script:
-  - git clone -b ${OPENSSL_BRANCH} https://github.com/openssl/openssl.git
+  - curl -L https://cpanmin.us | sudo perl - --sudo App::cpanminus
+  - 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}
+  - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then export LD_LIBRARY_PATH="${PREFIX}/lib:${LD_LIBRARY_PATH:-}"; fi
+  - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then export DYLD_LIBRARY_PATH="${PREFIX}/lib:${DYLD_LIBRARY_PATH:-}"; fi
+  - 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