From 3e908cc03c48fa952fc0a496d01b94f0f3c8f79d Mon Sep 17 00:00:00 2001 From: David Wagner Date: Mon, 13 Apr 2015 11:39:37 +0200 Subject: Revert "Merge pull request #88 from krocard/improve_travis_debug_build" This reverts commit 339779ac82acb755f6e992bf7ee54e3b791a9ca6, reversing changes made to 1b071faddaf8c5e835ea38d6c8d2d5db88011251. --- .travis.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3fec8b1..b6ba41e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,10 +21,6 @@ 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 && @@ -36,14 +32,19 @@ 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_debug/bindings/python" - --exclude "build_debug/CMakeFiles" - --exclude "build" + --exclude "build/bindings/python" + --exclude "build/CMakeFiles" --exclude "skeleton-subsystem" --exclude "test/test-subsystem" --exclude "bindings/c/Test.cpp" -- cgit v1.1