From c461b6940024907cb3f3ab4ff0e35f973897b72d Mon Sep 17 00:00:00 2001 From: Kevin Rocard Date: Mon, 13 Apr 2015 15:05:06 +0200 Subject: Revert "Revert "Merge pull request #88 from krocard/improve_travis_debug_build"" The pull request #88 was reverted as it broke travis build. In fact it only reveled a bug that was introduced in #80 (1b071fadd). The previous commit 0c0cc95 fixes the problem (cmake variable shadow). Revert the revert (d17b931a3dcc70cf9e) to restore the pull request #88. --- .travis.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index b6ba41e..3fec8b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,10 @@ install: # how to build script: + - ( mkdir build_debug && cd build_debug && + cmake -DCMAKE_BUILD_TYPE=Debug -DCOVERAGE=ON .. && + make -j && + CTEST_OUTPUT_ON_FAILURE=1 make ExperimentalTest ExperimentalMemCheck ) - ( mkdir build && cd build && cmake .. && make -j && @@ -32,19 +36,14 @@ script: make && sudo make install && sudo ldconfig ) - - ( cd build && - cmake -DCMAKE_BUILD_TYPE=Debug -DCOVERAGE=ON .. && - make -j && - sudo make install && - sudo ldconfig && - CTEST_OUTPUT_ON_FAILURE=1 make ExperimentalTest ExperimentalCoverage ExperimentalMemCheck ) after_success: # Push coverage info on coveralls.io. # Ignore generated files, samples and tests - coveralls - --exclude "build/bindings/python" - --exclude "build/CMakeFiles" + --exclude "build_debug/bindings/python" + --exclude "build_debug/CMakeFiles" + --exclude "build" --exclude "skeleton-subsystem" --exclude "test/test-subsystem" --exclude "bindings/c/Test.cpp" -- cgit v1.1