travis: enable MP_TEST on -O0, reduce wml test timer

This commit is contained in:
Chris Beck 2014-12-28 19:40:10 -05:00
parent 64ee2d8e10
commit 5c9bb9345c

View file

@ -22,28 +22,29 @@ before_install:
- export WML_TESTS=true
- export CPP_TESTS=true
- export PLAY_TEST=true
- export MP_TEST=false
- export MP_TEST=true
- export STRICT_COMPILATION=true
- export EXTRA_FLAGS_RELEASE="-O0"
- export WML_TEST_TIME=40
- export WML_TEST_TIME=20
- export NLS=false
- export CXX11=false
- if [ "$BUILD" == "-O2" ]; then export STRICT_COMPILATION=false; fi
- if [ "$BUILD" == "-O2" ]; then export EXTRA_FLAGS_RELEASE=""; fi
- if [ "$BUILD" == "-O2" ]; then export WML_TEST_TIME=20; fi
- if [ "$BUILD" == "-O2" ]; then export MP_TEST=true; fi
- if [ "$BUILD" == "-O2" ]; then export WML_TEST_TIME=15; fi
- if [ "$BUILD" == "C++11 -O0" ]; then export CXX11=true; fi
- if [ "$BUILD" == "C++11 -O0" ]; then export EXTRA_FLAGS_RELEASE="-O0 -Wno-literal-suffix -Wno-deprecated-declarations"; fi
- if [[ "$BUILD" == "C++11 -O0" ]] && [[ "$CXX" == "clang++" ]]; then export EXTRA_FLAGS_RELEASE="-O0 -Wno-literal-suffix -Wno-deprecated-declarations -Wno-deprecated-register"; fi
- if [ "$BUILD" == "C++11 -O0" ]; then export PLAY_TEST=false; fi
- if [ "$BUILD" == "C++11 -O0" ]; then export MP_TEST=false; fi
- if [ "$BUILD" == "translations" ]; then export NLS=true; fi
- if [ "$BUILD" == "translations" ]; then export TARGETS="translations"; fi
- if [ "$BUILD" == "translations" ]; then export WML_TESTS=false; fi
- if [ "$BUILD" == "translations" ]; then export CPP_TESTS=false; fi
- if [ "$BUILD" == "translations" ]; then export PLAY_TEST=false; fi
- if [ "$BUILD" == "translations" ]; then export MP_TEST=false; fi
install:
- sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu/ saucy main universe"