diff --git a/.travis.yml b/.travis.yml index 249c6b242722..07a4ed641e7f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,12 +11,15 @@ compiler: env: - BUILD="-O0" - BUILD="-O2" + - BUILD="C++14 -O2" - BUILD="translations" matrix: exclude: - compiler: gcc env: BUILD="-O2" + - compiler: gcc + env: BUILD="C++14 -O2" - compiler: gcc env: BUILD="translations" @@ -31,7 +34,7 @@ before_install: - export EXTRA_FLAGS_RELEASE="-O0" - export WML_TEST_TIME=20 - export NLS=false - - export CXX11=true + - export CXXSTD=11 - if [ "$CXX" == "g++" ]; then export CXX=g++-4.7; fi @@ -39,6 +42,11 @@ before_install: - if [ "$BUILD" == "-O2" ]; then export EXTRA_FLAGS_RELEASE=""; fi - if [ "$BUILD" == "-O2" ]; then export WML_TEST_TIME=15; fi + - if [ "$BUILD" == "C++14 -O2" ]; then export STRICT_COMPILATION=false; fi + - if [ "$BUILD" == "C++14 -O2" ]; then export EXTRA_FLAGS_RELEASE=""; fi + - if [ "$BUILD" == "C++14 -O2" ]; then export WML_TEST_TIME=15; fi + - if [ "$BUILD" == "C++14 -O2" ]; then export CXXSTD=14; fi + - if [ "$BUILD" == "-O0" ]; then export EXTRA_FLAGS_RELEASE="-O0 -Wno-literal-suffix -Wno-deprecated-declarations"; fi - if [[ "$BUILD" == "-O0" ]] && [[ "$CXX" == "clang++" ]]; then export EXTRA_FLAGS_RELEASE="-O0 -Wno-literal-suffix -Wno-deprecated-declarations -Wno-deprecated-register"; fi - if [ "$BUILD" == "-O0" ]; then export PLAY_TEST=false; fi @@ -59,8 +67,8 @@ script: - ./utils/travis/check_utf8.sh - ./utils/travis/utf8_bom_dog.sh - $CXX --version - - echo "*Params* --- " "cxxtool=$CXX --debug=time build=release extra_flags_release="$EXTRA_FLAGS_RELEASE" strict=$STRICT_COMPILATION $TARGETS cxx0x=$CXX11 nls=$NLS jobs=2" - - scons cxxtool=$CXX --debug=time build=release extra_flags_config="$EXTRA_FLAGS_ALL" extra_flags_release="$EXTRA_FLAGS_RELEASE" strict=$STRICT_COMPILATION $TARGETS cxx0x=$CXX11 nls=$NLS jobs=2 + - echo "*Params* --- " "cxxtool=$CXX --debug=time build=release extra_flags_release="$EXTRA_FLAGS_RELEASE" strict=$STRICT_COMPILATION $TARGETS cxx_std=$CXXSTD nls=$NLS jobs=2" + - scons cxxtool=$CXX --debug=time build=release extra_flags_config="$EXTRA_FLAGS_ALL" extra_flags_release="$EXTRA_FLAGS_RELEASE" strict=$STRICT_COMPILATION $TARGETS cxx_std=$CXXSTD nls=$NLS jobs=2 - "export DISPLAY=:99.0" - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1024x768x24" - if [ "$CPP_TESTS" = true ]; then ./utils/travis/test_wrapper.sh; fi