diff options
| author | Kevin Rocard <kevin.rocard@intel.com> | 2015-04-13 15:05:06 +0200 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2015-04-24 13:39:14 -0700 |
| commit | c461b6940024907cb3f3ab4ff0e35f973897b72d (patch) | |
| tree | 6b599d67ee7aad5b294d6914f10eb71ed05a527d | |
| parent | a2d3f22e6c15dc84e266ff108d1fd42a8b665309 (diff) | |
| download | external_parameter-framework-c461b6940024907cb3f3ab4ff0e35f973897b72d.zip external_parameter-framework-c461b6940024907cb3f3ab4ff0e35f973897b72d.tar.gz external_parameter-framework-c461b6940024907cb3f3ab4ff0e35f973897b72d.tar.bz2 | |
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.
| -rw-r--r-- | .travis.yml | 15 |
1 files 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" |