diff options
| author | Andriy Senkovych <jolly_roger@itblog.org.ua> | 2014-11-12 02:57:25 +0300 |
|---|---|---|
| committer | Andriy Senkovych <jolly_roger@itblog.org.ua> | 2014-11-19 04:13:06 +0300 |
| commit | 40c03114e3b4a0751faa134e2ef917fcaf6fee63 (patch) | |
| tree | 2c06292b7007eb3da89afb4573062b2c7091f188 /.travis.yml | |
| parent | bff9625e866376e21ef7aafbfbb123d5e7523826 (diff) | |
Try new travis configuration
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/.travis.yml b/.travis.yml index 986ca0e0..cbc5c0f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,36 +6,35 @@ compiler: env: matrix: - - CONF=debug BITS=64 - - CONF=release BITS=64 - - CONF=debug BITS=32 - - CONF=release BITS=32 + - CONF=debug ARCH=x86_64 ARCH_FLAGS="" + - CONF=release ARCH=x86_64 ARCH_FLAGS="" + - CONF=debug ARCH=x86 ARCH_FLAGS="-m32" + - CONF=release ARCH=x86 ARCH_FLAGS="-m32" global: - GITHUB_REPO='miloyip/rapidjson' - - DEFINES='-DRAPIDJSON_HAS_STDSTRING' - secure: "HrsaCb+N66EG1HR+LWH1u51SjaJyRwJEDzqJGYMB7LJ/bfqb9mWKF1fLvZGk46W5t7TVaXRDD5KHFx9DPWvKn4gRUVkwTHEy262ah5ORh8M6n/6VVVajeV/AYt2C0sswdkDBDO4Xq+xy5gdw3G8s1A4Inbm73pUh+6vx+7ltBbk=" before_install: - - sudo add-apt-repository -y ppa:codegear/release - - sudo apt-get update -qq - - sudo apt-get install -qq premake4 valgrind - - if [ "$BITS" = 32 ]; then sudo apt-get install -qq g++-multilib libc6-dbg:i386; fi + - sudo apt-get install -qq cmake doxygen valgrind + - if [ "$ARCH" = "x86" ]; then sudo apt-get install -qq g++-multilib libc6-dbg:i386; fi install: true before_script: - - (cd build && premake4 'gmake') + - mkdir build + - > + (cd build && cmake + -DRAPIDJSON_HAS_STDSTRING=ON + -DCMAKE_VERBOSE_MAKEFILE=ON + -DCMAKE_BUILD_TYPE=$CONF + -DCMAKE_C_FLAGS="$ARCH_FLAGS" ..) # hack to avoid Valgrind bug (https://bugs.kde.org/show_bug.cgi?id=326469), # exposed by merging PR#163 (using -march=native) - - (cd build/gmake && sed -i 's/march=native/msse4.2/' *.make) +# - (cd build/gmake && sed -i 's/march=native/msse4.2/' *.make) script: - - make -C build/gmake -f test.make config=${CONF}${BITS} - - make -C build/gmake -f example.make config=${CONF}${BITS} - - if [ "$CONF" = "debug" ] && ( objdump -t -C intermediate/${CONF}/gmake/unittest/x${BITS}/namespacetest.o | grep rapidjson ) ; then echo "Symbol check failed!" ; false; fi - - pushd bin - - ./unittest_${CONF}_x${BITS}_gmake - - valgrind --leak-check=full --error-exitcode=1 ./unittest_${CONF}_x${BITS}_gmake - - if [ "$CONF" = "release" ]; then ./perftest_${CONF}_x${BITS}_gmake; fi - - popd - - ./build/travis-doxygen.sh; + - cd build + - make tests + - make examples + - ctest -V + - make travis_doc |