Adding back two compilers

3 files changed, 44 insertions, 48 deletions

diff --git a/.travis.yml b/.travis.yml
index 41307678..95d767f1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,21 +11,39 @@ env:
     secure: NGWn7hJAd/iYfJQmr8oDjTlwttldj8zB+X0gk2TqDhAJ2gLiZ2+b8Bp5FSzBlNIyhcbuhzRU+rzkbo03XSwXZXFRZK/gyPMGaB75ay8MLQBrN3L7THXbjQm1SZg2mO17/MKT+rJH/NvhmqPoUoJaYnoki1G6AZfhnDx+3bW4MNp5/g3u8trk1HNvXWTvjdqS99OH36bvoq8BsOi53Po1veeCIWza6JO61n2nRHzCC2sYWtsZyTQSi3B//iie5zF3gvuRorbzjA/ayc8lLmhUsTmoA1t9HJP52fKzv/q3mxllXzyzpWNRmUJCzf7I1wY9jp1FVwojfl0umofzYPCCjwSrKlRtmwQfi0peg7VOJVCCJx7Eh/i0hamGUnDEu0aZnfhgwzkqDDIgO1AwcEv5i9egt/73kK4mdm22sEDa3dWVu37tnj5dItaQesMm6TXKMy9+r7v0aaVJbQB2atvBaf3RlW71P9iy8mOZ+geKNwVFRuBdu5g3oQe5QrqXRi4inMv0bjN8HwOVs/f8ZTGZePnbHnxOnYRErxLnha/bsu7btfDT8Q8nmZ/Rhcu7QkMRNTm5L3+YHFUngiIygOs8wrH6HECtSYwmi9WejRuPgU2GnYR0Rzyi5dyaFok1iN+jsYsY9YFx5tRgxuX4H9CnUlfDabdFSLzqbmKRlbP79as=
 git:
   depth: 1
+install:
+  - "sudo apt-get -qq update"
+  - "sudo apt-get install -y libegl1-mesa-dev xorg-dev doxygen"
 language: cpp
-addons:
-  apt:
-    packages:
-      - g++-7
-      - libegl1-mesa-dev
-      - xorg-dev
-      - doxygen
-    sources:
-      - ubuntu-toolchain-r-test
-compiler:
-  - g++-7
-os:
-  - linux
+matrix:
+  include:
+    -
+      addons:
+        apt:
+          packages:
+            - g++-7
+          sources:
+            - ubuntu-toolchain-r-test
+      compiler: g++-7
+      env:
+        - "MATRIX_EVAL=\"CC=gcc-7 && CXX=g++-7\""
+        - BUILD_DOCS=1
+      os: linux
+    -
+      addons:
+        apt:
+          packages:
+            - g++-7
+            - clang-5.0
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-5.0
+      compiler: clang++-5.0
+      env:
+        - "MATRIX_EVAL=\"CC=clang-5.0 && CXX=clang++-5.0\""
+      os: linux
 notifications:
   email: false
 script:
   - ./scripts/travis_build
+sudo: required
diff --git a/scripts/travis_build b/scripts/travis_build
index 0ce51e13..e60088c8 100755
--- a/scripts/travis_build
+++ b/scripts/travis_build
@@ -12,11 +12,11 @@ cd $TRAVIS_BUILD_DIR
 # start building
 mkdir -p build
 cd build
-cmake ..
+cmake -DYAGE_BUILD_TESTS=ON -DYAGE_BUILD_DOCS=ON ..
 make
 cd tests
 ctest -j 2 --schedule-random --repeat-until-fail 3
-cd ../..
+cd ..
 
 # update docs if we are on the master branch
 echo "TRAVIS_BRANCH = " $TRAVIS_BRANCH
@@ -25,15 +25,15 @@ echo "CC            = " $CC
 echo "CXX           = " $CXX
 
 if [[ $TRAVIS_BRANCH = "master" && $BUILD_DOCS -eq 1 ]]; then
-    if [[ -d "build/doc_doxygen/html" ]]; then
-        git clone -b gh-pages "https://$GH_TOKEN@github.com/ymherklotz/YAGE.git" YAGE_gh-pages
-        cd YAGE_gh-pages
-        git config user.name "TravisBot"
-        git config user.email ""
-        rm -rf *
-        cp -r ../build/doc_doxygen/html/* .
-        git add -A .
-        git commit -m "[Travis] Rebuilding documentation"
-        git push -q origin gh-pages
-    fi
+  if [[ -d "build/doc_doxygen/html" ]]; then
+    git clone -b gh-pages "https://$GH_TOKEN@github.com/ymherklotz/YAGE.git" YAGE_gh-pages
+    cd YAGE_gh-pages
+    git config user.name "TravisBot"
+    git config user.email ""
+    rm -rf *
+    cp -r ../build/doc_doxygen/html/* .
+    git add -A .
+    git commit -m "[Travis] Rebuilding documentation"
+    git push -q origin gh-pages
+  fi
 fi
diff --git a/tests/yage_test.cpp b/tests/yage_test.cpp
deleted file mode 100644
index 7f495036..00000000
--- a/tests/yage_test.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-/** ---------------------------------------------------------------------------
- * @file: test.cpp
- *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
- * MIT License, see LICENSE file for more details.
- * ----------------------------------------------------------------------------
- */
-
-#include <gtest/gtest.h>
-#include <yage/yage.h>
-
-TEST(YAGE, InitQuit)
-{
-    yage::init();
-    yage::quit();
-}
-
-int main(int argc, char **argv)
-{
-    testing::InitGoogleTest(&argc, argv);
-    return RUN_ALL_TESTS();
-}