Updated travis.yml.

--HG--
branch : develop

.travis.yml

@@ -1,62 +1,73 @@
 language: cpp
 
-os:
+matrix:
-  - linux
+  include:
+    - os: linux
+      dist: trusty
+      sudo: required
+      compiler: clang
+    - os: osx
+      compiler: clang
 
-compiler:
+before_install:
-  - gcc
+  - |
-  - clang
+    if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-
+      sudo apt-get -qq update;
-sudo: false
+      sudo apt-get install -y qtbase5-dev;
-
+      sudo apt-get install -y libqt5svg5-dev;
-install:
+      sudo apt-get install -y qt5-default;
-  # g++4.8.1
+      sudo apt-get install -y qttools5-dev-tools;
-  - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8"  CC="gcc-4.8"; fi
+      sudo apt-get install -y libqt5xmlpatterns5-dev;
-
+      sudo apt-get install -y libqt5core5a;
-addons:
+      sudo apt-get install -y libqt5gui5;
-  apt:
+      sudo apt-get install -y libqt5printsupport5;
-    sources:
+      sudo apt-get install -y libqt5svg5;
-    - ubuntu-toolchain-r-test
+      sudo apt-get install -y libqt5widgets5;
-    - ubuntu-sdk-team
+      sudo apt-get install -y libqt5xml5;
-    packages:
+      sudo apt-get install -y libqt5xmlpatterns5;
-    - qtbase5-dev 
+      sudo apt-get install -y xpdf;
-    - libqt5svg5-dev 
+      sudo apt-get install -y xvfb;
-    - qt5-default 
+    else
-    - qttools5-dev-tools 
+      brew update > /dev/null;
-    - libqt5xmlpatterns5-dev
+      brew install qt5;
-    - libqt5core5a 
+      chmod -R 755 /usr/local/opt/qt5/*
-    - libqt5gui5 
+    fi
-    - libqt5printsupport5 
-    - libqt5svg5 
-    - libqt5widgets5 
-    - libqt5xml5 
-    - libqt5xmlpatterns5 
-    - xpdf
-    - gcc-4.8
-    - g++-4.8
-    - clang
 
 before_script:
-  # QTestLib require GUI support for some tests
+  - |
-  - "export DISPLAY=:99.0"
+    if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-  - "sh -e /etc/init.d/xvfb start"
+      uname -a;
+      which qmake;
+    else
+      QTDIR="/usr/local/opt/qt5";
+      PATH="$QTDIR/bin:$PATH";
+      LDFLAGS=-L$QTDIR/lib;
+      CPPFLAGS=-I$QTDIR/include;
+      PKG_CONFIG_PATH=/usr/local/opt/qt5/lib/pkgconfig;
+    fi
   - mkdir build
   - cd build
-  - which qmake
+  - pwd
-  - uname -a
   - qmake --version
-  - qmake ../Valentina.pro -r CONFIG+=no_ccache
+  - qmake ../Valentina.pro -r CONFIG+=noDebugSymbols CONFIG+=no_ccache CONFIG+=checkWarnings
 
 script:
   - $CXX --version
   - make -j$(nproc)
-  - DISPLAY=:99.0 make check
+  - |
+    if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+      export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"/home/travis/build/dismine/Valentina/build/src/libs/vpropertyexplorer/bin:/home/travis/build/dismine/Valentina/build/src/libs/qmuparser/bin";
+      xvfb-run -a make --silent check TESTARGS="-silent";
+    else
+      export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"/Users/travis/build/dismine/Valentina/build/src/libs/vpropertyexplorer/bin:/Users/travis/build/dismine/Valentina/build/src/libs/qmuparser/bin";
+      make --silent check TESTARGS="-silent";
+    fi  
 
 notifications:
    email:
      recipients:
         - dismine@gmail.com
         - susan.spencer@gmail.com
-        - zhuravska19@gmail.com
      on_success: change
      on_failure: always
+