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

diff --git a/.travis.yml b/.travis.yml
index 2949dc0..b3c120f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 sudo: required
-dist: trusty
+dist: xenial
 
 os: linux
 
@@ -7,33 +7,29 @@ language: c
 
 addons:
   apt:
-    packages:
-    - cpanminus
+    packages: [ cpanminus ]
+  homebrew:
+    packages: [ cpanminus ]
 
 env:
   global:
     - PREFIX=${HOME}/opt
-    - LD_LIBRARY_PATH=${PREFIX}/lib
     - PATH=${PREFIX}/bin:${PATH}
+    - OPENSSL_BRANCH=master
 
 matrix:
   include:
-    - env: OPENSSL_BRANCH=master
-      os: linux
+    - os: linux
       compiler: gcc
-    - env:
-      - OPENSSL_BRANCH=master
-      - ASAN=-DASAN=1
+    - 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:
+  - 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
@@ -41,6 +37,8 @@ before_script:
   - cd ..
 
 script:
+  - 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} ..