[tarantool-patches] [PATCH 3/3] Add LTO testing && refactor travis.yml

AKhatskevich avkhatskevich at tarantool.org
Wed Aug 8 14:10:03 MSK 2018


---
 .travis.mk  |  2 +-
 .travis.yml | 50 +++++++++-----------------------------------------
 2 files changed, 10 insertions(+), 42 deletions(-)

diff --git a/.travis.mk b/.travis.mk
index 66c921aa7..8077cddba 100644
--- a/.travis.mk
+++ b/.travis.mk
@@ -49,7 +49,7 @@ deps_osx:
 	brew install openssl readline curl icu4c --force
 
 test_osx: deps_osx
-	cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo
+	cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo ${CMAKE_EXTRA_PARAMS}
 	# Increase the maximum number of open file descriptors on macOS
 	sudo sysctl -w kern.maxfiles=20480 || :
 	sudo sysctl -w kern.maxfilesperproc=20480 || :
diff --git a/.travis.yml b/.travis.yml
index 997302e16..ee713be91 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,11 +4,7 @@ services:
 
 language: cpp
 
-os:
-  - linux
-  - osx
-
-osx_image: xcode9
+os: linux
 
 cache:
     directories:
@@ -37,44 +33,16 @@ env:
 matrix:
     allow_failures:
       - TARGET=coverage
-#      - env: OS=el DIST=6
-#      - env: OS=el DIST=7
-#      - env: OS=fedora DIST=26
-#      - env: OS=fedora DIST=27
-#      - env: OS=ubuntu DIST=artful
-#      - env: OS=ubuntu DIST=trusty
-#      - env: OS=ubuntu DIST=xenial
-#      - env: OS=ubuntu DIST=bionic
-#      - env: OS=debian DIST=wheezy
-#      - env: OS=debian DIST=jessie
-#      - env: OS=debian DIST=stretch
-    exclude:
-      - env: OS=el DIST=6
-        os: osx
-      - env: OS=el DIST=7
-        os: osx
-      - env: OS=fedora DIST=26
-        os: osx
-      - env: OS=fedora DIST=27
-        os: osx
-      - env: OS=ubuntu DIST=artful
-        os: osx
-      - env: OS=ubuntu DIST=trusty
-        os: osx
-      - env: OS=ubuntu DIST=xenial
-        os: osx
-      - env: OS=ubuntu DIST=bionic
-        os: osx
-      - env: OS=debian DIST=wheezy
-        os: osx
-      - env: OS=debian DIST=jessie
-        os: osx
-      - env: OS=debian DIST=stretch
-        os: osx
-      - env: TARGET=source
+    include:
+      - osx_image: xcode9
         os: osx
-      - env: TARGET=coverage
+        env:
+          - TARGET=test
+      - osx_image: xcode9
         os: osx
+        env:
+          - TARGET=test
+          - CMAKE_EXTRA_PARAMS="-DTARANTOOL_LTO=TRUE"
 
 script:
   - make -f .travis.mk ${TARGET}
-- 
2.14.1





More information about the Tarantool-patches mailing list