diff options
-rw-r--r-- | .travis.yml | 32 | ||||
-rw-r--r-- | platform/linux/config.cmake | 2 | ||||
-rwxr-xr-x | scripts/travis_setup.sh | 2 | ||||
-rw-r--r-- | test/util/offscreen_texture.test.cpp | 2 |
4 files changed, 19 insertions, 19 deletions
diff --git a/.travis.yml b/.travis.yml index df83f13459..86de437bfb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,14 +7,12 @@ addons_shortcuts: apt: sources: [ 'ubuntu-toolchain-r-test', 'george-edison55-precise-backports' ] packages: [ 'clang-3.5', 'libstdc++-4.9-dev', 'libstdc++6', 'libllvm3.8v4', 'cmake', 'cmake-data', - 'mesa-utils', 'libxi-dev', 'libglu1-mesa-dev', 'x11proto-randr-dev', 'x11proto-xext-dev', 'libxrandr-dev', - 'x11proto-xf86vidmode-dev', 'libxxf86vm-dev', 'libxcursor-dev', 'libxinerama-dev' ] + 'libxrandr-dev', 'libxcursor-dev', 'libxinerama-dev' ] addons_gcc5: &gcc5 apt: sources: [ 'ubuntu-toolchain-r-test', 'george-edison55-precise-backports' ] - packages: [ 'gdb', 'g++-5', 'gcc-5', 'cmake', 'cmake-data', - 'mesa-utils', 'libxi-dev', 'libglu1-mesa-dev', 'x11proto-randr-dev', 'x11proto-xext-dev', 'libxrandr-dev', - 'x11proto-xf86vidmode-dev', 'libxxf86vm-dev', 'libxcursor-dev', 'libxinerama-dev' ] + packages: [ 'g++-5', 'gcc-5', 'libllvm3.8v4', 'cmake', 'cmake-data', + 'libxrandr-dev', 'libxcursor-dev', 'libxinerama-dev' ] addons_qt4: &qt4 apt: sources: [ 'ubuntu-toolchain-r-test', 'george-edison55-precise-backports' ] @@ -46,6 +44,7 @@ before_script: script: - make linux - make benchmark + - make test - make run-test after_script: - ccache --show-stats @@ -75,11 +74,13 @@ matrix: - ./platform/node/scripts/after_script.sh ${TRAVIS_JOB_NUMBER} # GCC 5 - Debug - Coverage + # FIXME: https://github.com/mapbox/mapbox-gl-native/issues/6918 - os: linux - sudo: false + sudo: required + dist: trusty language: cpp compiler: "glfw-gcc5-debug" - env: BUILDTYPE=Debug _CXX=g++-5 _CC=gcc-5 WITH_COVERAGE=1 + env: BUILDTYPE=Debug _CXX=g++-5 _CC=gcc-5 WITH_COVERAGE=1 WITH_OSMESA=1 addons: *gcc5 after_script: - ccache --show-stats @@ -87,10 +88,11 @@ matrix: # GCC 5 - Release - os: linux - sudo: false + sudo: required + dist: trusty language: cpp compiler: "glfw-gcc5-release" - env: BUILDTYPE=Release _CXX=g++-5 _CC=gcc-5 + env: BUILDTYPE=Release _CXX=g++-5 _CC=gcc-5 WITH_OSMESA=1 addons: *gcc5 # Clang 3.5 - Debug @@ -99,7 +101,7 @@ matrix: dist: trusty language: cpp compiler: "glfw-clang35-debug" - env: BUILDTYPE=Debug _CXX=clang++-3.5 _CC=clang-3.5 + env: BUILDTYPE=Debug _CXX=clang++-3.5 _CC=clang-3.5 WITH_OSMESA=1 addons: *clang35 # Clang 3.5 - Release @@ -108,7 +110,7 @@ matrix: dist: trusty language: cpp compiler: "glfw-clang35-release" - env: BUILDTYPE=Release _CXX=clang++-3.5 _CC=clang-3.5 + env: BUILDTYPE=Release _CXX=clang++-3.5 _CC=clang-3.5 WITH_OSMESA=1 addons: *clang35 # Clang 3.5 - check @@ -117,7 +119,7 @@ matrix: dist: trusty language: cpp compiler: "check-clang35-release" - env: BUILDTYPE=Release _CXX=clang++-3.5 _CC=clang-3.5 + env: BUILDTYPE=Release _CXX=clang++-3.5 _CC=clang-3.5 WITH_OSMESA=1 addons: *clang35 script: - git fetch origin master:refs/remotes/origin/master @@ -129,7 +131,7 @@ matrix: dist: trusty language: cpp compiler: "qt4-gcc5-release" - env: BUILDTYPE=Release _CXX=g++-5 _CC=gcc-5 WITH_QT_4=1 + env: BUILDTYPE=Release _CXX=g++-5 _CC=gcc-5 RUN_XVFB=1 WITH_QT_4=1 addons: *qt4 script: - make qt-app @@ -141,9 +143,7 @@ matrix: dist: trusty language: cpp compiler: "qt5-gcc5-release" - # Qt 5 gets confused with fglrx that is installed by default on Travis - # trusty bots. This way we force both Qt and Xvfb to load on mesa drivers. - env: BUILDTYPE=Release _CXX=g++-5 _CC=gcc-5 LD_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu/mesa + env: BUILDTYPE=Release _CXX=g++-5 _CC=gcc-5 RUN_XVFB=1 addons: *qt5 script: - make qt-app diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake index e8de737835..8acb6e7e14 100644 --- a/platform/linux/config.cmake +++ b/platform/linux/config.cmake @@ -1,5 +1,5 @@ mason_use(glfw VERSION 3.2.1) -mason_use(mesa VERSION 13.0.0) +mason_use(mesa VERSION 13.0.0${MASON_CXXABI_SUFFIX}) mason_use(boost_libprogram_options VERSION 1.60.0) mason_use(sqlite VERSION 3.14.2) mason_use(libuv VERSION 1.9.1) diff --git a/scripts/travis_setup.sh b/scripts/travis_setup.sh index 6fa1cc858c..47df36788d 100755 --- a/scripts/travis_setup.sh +++ b/scripts/travis_setup.sh @@ -38,7 +38,7 @@ mapbox_time "touch_package_json" \ touch package.json # Start the mock X server -if [ -f /etc/init.d/xvfb ] && [ -z "${WITH_OSMESA}" ]; then +if [ -f /etc/init.d/xvfb ] && [ ! -z "${RUN_XVFB}" ]; then mapbox_time "start_xvfb" \ sh -e /etc/init.d/xvfb start sleep 2 # sometimes, xvfb takes some time to start up diff --git a/test/util/offscreen_texture.test.cpp b/test/util/offscreen_texture.test.cpp index 56972b9810..683a4e6095 100644 --- a/test/util/offscreen_texture.test.cpp +++ b/test/util/offscreen_texture.test.cpp @@ -1,9 +1,9 @@ #include <mbgl/test/util.hpp> +#include <mbgl/gl/gl.hpp> #include <mbgl/gl/context.hpp> #include <mbgl/platform/default/headless_backend.hpp> #include <mbgl/platform/default/offscreen_view.hpp> -#include <mbgl/gl/gl.hpp> #include <mbgl/util/offscreen_texture.hpp> |