From 4cc0065881d10b260b92eb531109c35aef41fd47 Mon Sep 17 00:00:00 2001 From: peternewman Date: Sun, 23 Nov 2014 14:28:04 +0000 Subject: [PATCH] Try and fix coveralls still --- .travis.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index a6672ff6fe..95c4ffc643 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,6 @@ cache: apt before_install: - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y - sudo apt-get update -qq - - sudo apt-cache search microhttpd - sudo apt-get install -qq protobuf-compiler libprotobuf-lite7 libprotobuf-dev libprotoc-dev bison flex libftdi-dev libftdi1 libusb-1.0-0-dev liblo-dev libavahi-client-dev uuid-dev libcppunit-dev libcppunit-1.12-1 libncurses5-dev python-protobuf libmicrohttpd-dev #g++-4.9 won't work on Ubuntu 12.04 that Travis currently uses - if [ "$CXX" = "g++" ]; then sudo apt-get install -qq g++-4.8; fi @@ -32,15 +31,13 @@ before_install: #Remove the old g++/gcc to ensure we're using the latest ones - if [ "$CXX" = "g++-4.8" ]; then sudo rm /usr/bin/g++; sudo rm /usr/bin/gcc; fi #Install coveralls if required - - if [ "$TASK" = "coverage" ]; then sudo pip install cpp-coveralls; fi + - if [ "$TASK" = "coverage" ]; then sudo pip install -qq cpp-coveralls; fi #Install doxygen if required - if [ "$TASK" = "doxygen" ]; then sudo apt-get install -qq doxygen; fi - - ls -al /usr/bin/*-4.8 - - ls -al /usr/bin/gcov* - - which gcov + - pwd after_success: - - if [ "$TASK" = "coverage" ]; then coveralls --gcov /usr/bin/gcov-4.8 -E 'Test.cpp$' --gcov-options '\-lp' > /dev/null; fi + - if [ "$TASK" = "coverage" ]; then pwd; coveralls --gcov /usr/bin/gcov-4.8 -b . -E 'Test.cpp$' --gcov-options '\-lp' > /dev/null; pwd; fi notifications: irc: