Skip to content

Commit

Permalink
package/ci: don't build with coverage on OSX.
Browse files Browse the repository at this point in the history
  • Loading branch information
mosra committed Aug 3, 2016
1 parent d4e6b03 commit b649521
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions package/ci/travis-desktop.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ cmake .. \
-DCMAKE_INSTALL_PREFIX=$HOME/deps \
-DCMAKE_INSTALL_RPATH=$HOME/deps/lib \
-DBUILD_TESTS=ON \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_CXX_FLAGS="--coverage $CXXFLAGS"
-DCMAKE_BUILD_TYPE=Release
make -j install
CORRADE_TEST_COLOR=ON ctest -V
cd ..
Expand Down
2 changes: 1 addition & 1 deletion package/ci/travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ install:
# so the directory tests pass (and then some workaround for crazy filesystem issues)
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then mkdir -p ~/.config/autostart; fi
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then mkdir -p ~/.local; fi
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then export CXXFLAGS=-DTRAVIS_CI_HAS_CRAZY_FILESYSTEM_ON_LINUX; fi
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then export CXXFLAGS="-DTRAVIS_CI_HAS_CRAZY_FILESYSTEM_ON_LINUX --coverage"; fi
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi
- if [ "$TRAVIS_OS_NAME" == "osx" ] && [ "$TARGET" == "ios-simulator" ]; then gem install xcpretty; fi
- if [ "$TRAVIS_OS_NAME" == "osx" ] && [ "$TARGET" == "ios-simulator" ]; then brew update && brew upgrade cmake; fi
Expand Down

0 comments on commit b649521

Please sign in to comment.