aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@m4x.org>2015-09-02 16:49:34 +0200
committerJeremy Lainé <jeremy.laine@m4x.org>2015-09-02 16:49:34 +0200
commiteea8f8509e4262d084e072e1bee2268ad384ec06 (patch)
tree3353eac21e181af93b2ad3b9b3253e03a2d9b3cf
parent73d9aa8badbf4cabf55fcc740cc79ec0d4b528f9 (diff)
downloadqxmpp-eea8f8509e4262d084e072e1bee2268ad384ec06.tar.gz
don't use gcc-specific profiling
-rw-r--r--src/src.pro7
-rwxr-xr-xtests/travis/build-and-test14
2 files changed, 1 insertions, 20 deletions
diff --git a/src/src.pro b/src/src.pro
index 44d8495d..6d4aa331 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -40,10 +40,3 @@ equals(QXMPP_LIBRARY_TYPE,staticlib) {
QMAKE_PKGCONFIG_CFLAGS = -DQXMPP_SHARED
}
unix:QMAKE_CLEAN += -r pkgconfig lib$${TARGET}.prl
-
-# profiling support
-equals(QXMPP_PROFILE,true) {
- QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage
- QMAKE_LIBS += -lgcov
- QMAKE_CLEAN += *.gcda *.gcov *.gcno
-}
diff --git a/tests/travis/build-and-test b/tests/travis/build-and-test
index 4aad8342..2f51f4de 100755
--- a/tests/travis/build-and-test
+++ b/tests/travis/build-and-test
@@ -1,7 +1,7 @@
#!/bin/sh
set -e
-QMAKE_ARGS="QXMPP_PROFILE=true"
+QMAKE_ARGS=""
if [ -n "$CC" ]; then
QMAKE_ARGS="$QMAKE_ARGS QMAKE_CC=$CC"
@@ -36,15 +36,3 @@ make VERBOSE=1
# run tests
make check
-exit 0
-
-# generate coverage report
-TRACEFILE=coverage.info
-rm -f $TRACEFILE
-lcov --capture --directory src -o $TRACEFILE --no-external
-lcov --remove $TRACEFILE \*moc_\* -o $TRACEFILE.clean
-mv $TRACEFILE.clean $TRACEFILE
-
-rm -rf coverage
-genhtml -o coverage $TRACEFILE
-echo "ok"