Merge fe9c2b9e7788eeba1ac6128ab076bc51be633d19 into 1586648a02fc0bf63a645bab966312c5b35e491b

This commit is contained in:
Steve Peak 2015-06-11 21:46:46 +00:00
commit cd43fcbab5

View File

@ -24,7 +24,7 @@ script:
- if [ ${COVERITY_SCAN_BRANCH} != 1 ]; then make -j2 ; fi - if [ ${COVERITY_SCAN_BRANCH} != 1 ]; then make -j2 ; fi
- make test - make test
# - if [ ${COVERAGE} = 1 ]; then coveralls -e "unittests/catch.hpp" -E ".*\.cpp" --gcov $GCOV ; fi # - if [ ${COVERAGE} = 1 ]; then coveralls -e "unittests/catch.hpp" -E ".*\.cpp" --gcov $GCOV ; fi
- if [ ${COVERAGE} = 1 ]; then bash <(curl -s https://codecov.io/bash | sed "s/# find all the reports/find . -name \"*.gcno\" | xargs \$GCOV -s \`cd .. \&\& pwd\` / ") ; fi - if [ ${COVERAGE} = 1 ]; then bash <(curl -s https://raw.githubusercontent.com/codecov/codecov-bash/wip/codecov) ; fi
after_script: after_script:
- if [ ${CPPCHECK} = 1 ]; then contrib/codeanalysis/runcppcheck.sh ; fi - if [ ${CPPCHECK} = 1 ]; then contrib/codeanalysis/runcppcheck.sh ; fi