From cb7f4907485cb83ba0b3983a6eec80a979b8c1e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 20 Mar 2017 12:50:08 +0100 Subject: [PATCH] package/ci: explicitly test building w/o deprecated features. --- package/ci/travis-desktop.sh | 4 +++- package/ci/travis.yml | 7 +++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/package/ci/travis-desktop.sh b/package/ci/travis-desktop.sh index 6ea55f820..6c86cb01c 100755 --- a/package/ci/travis-desktop.sh +++ b/package/ci/travis-desktop.sh @@ -9,6 +9,7 @@ cmake .. \ -DCMAKE_INSTALL_PREFIX=$HOME/deps \ -DCMAKE_INSTALL_RPATH=$HOME/deps/lib \ -DCMAKE_BUILD_TYPE=Debug \ + -DBUILD_DEPRECATED=$BUILD_DEPRECATED \ -DWITH_INTERCONNECT=OFF make -j install cd ../.. @@ -37,7 +38,8 @@ cmake .. \ -DWITH_MAGNUMINFO=ON \ -DWITH_AL_INFO=ON \ -DBUILD_TESTS=ON \ - -DBUILD_GL_TESTS=ON + -DBUILD_GL_TESTS=ON \ + -DBUILD_DEPRECATED=$BUILD_DEPRECATED # Otherwise the job gets killed (probably because using too much memory) make -j4 ASAN_OPTIONS="color=always" LSAN_OPTIONS="color=always suppressions=$TRAVIS_BUILD_DIR/package/ci/leaksanitizer.conf" CORRADE_TEST_COLOR=ON ctest -V -E GLTest diff --git a/package/ci/travis.yml b/package/ci/travis.yml index 8b24157c4..a4f69b13d 100644 --- a/package/ci/travis.yml +++ b/package/ci/travis.yml @@ -17,6 +17,12 @@ matrix: compiler: gcc env: - TARGET=desktop + - language: cpp + os: linux + compiler: gcc + env: + - TARGET=desktop + - BUILD_DEPRECATED=OFF - language: cpp os: linux compiler: clang @@ -114,6 +120,7 @@ install: - if [ "$TRAVIS_OS_NAME" == "linux" ] && [ ! "$TARGET" == "desktop-sanitizers" ]; then export CXX=g++-4.7; fi - if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$TARGET" == "desktop-sanitizers" ]; then export CXX=clang++-3.8; fi +- if [ "$BUILD_DEPRECATED" != "OFF" ]; then export BUILD_DEPRECATED=ON; fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then export PLATFORM_GL_API=GLX; fi - if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$TARGET" == "android" ]; then wget -nc http://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin && chmod +x android-*.bin && ./android-*.bin -y | grep -v Extracting; fi - if [ "$TRAVIS_OS_NAME" == "osx" ] && [ "$TARGET" == "desktop" ]; then export PLATFORM_GL_API=CGL; fi