From 8ee67b5af84e9a28dd8bae4cf88bff630b5983d3 Mon Sep 17 00:00:00 2001 From: xawotihs Date: Sun, 21 Dec 2014 22:49:47 +0100 Subject: [PATCH 1/9] Adds coverage support --- .travis.yml | 2 ++ projects/mtg/wagic-qt.pro | 7 +++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index d08eaea03..508aaa3dc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,6 +43,7 @@ install: fi - sudo pip install pyjavaproperties - sudo pip install github3.py +- sudo pip install cpp-coveralls env: global: @@ -53,6 +54,7 @@ env: script: "tools/travis-script.sh" after_success: +- coveralls - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l core.zip -r Wagic-core.zip -b $TRAVIS_BRANCH - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l projects/mtg/Android/bin/Wagic-debug.apk -r Wagic-android.apk -b $TRAVIS_BRANCH - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l projects/mtg/psprelease.zip -r Wagic-psp.zip -b $TRAVIS_BRANCH diff --git a/projects/mtg/wagic-qt.pro b/projects/mtg/wagic-qt.pro index d53f75fcd..2a11570d8 100644 --- a/projects/mtg/wagic-qt.pro +++ b/projects/mtg/wagic-qt.pro @@ -19,13 +19,12 @@ else:CONFIG(graphics, graphics|console){ DEPLOYMENTFOLDERS = folder_01 QT += core gui opengl network multimedia QT -= declarative quick qml - #maemo5:DEFINES += QT_WIDGET DEFINES += QT_WIDGET unix:!symbian:INCLUDEPATH += /usr/include/GL - # Please do not modify the following two lines. Required for deployment. -# !maemo5:include(qml/qmlapplicationviewer/qmlapplicationviewer.pri) -# !maemo5:qtcAddDeployment() + QMAKE_CXXFLAGS += -g -fprofile-arcs -ftest-coverage + QMAKE_LDFLAGS += -g -fprofile-arcs -ftest-coverage + LIBS += -lgcov } #!android:!symbian:QT += phonon From 9fc551982b327e2ee5e4a615fdf4b572e5ffc182 Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Fri, 26 Dec 2014 21:23:11 +0100 Subject: [PATCH 2/9] Update .travis.yml Updated android sdk version --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 508aaa3dc..aeb3c6e93 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ before_install: export ANDROID="android-sdk-linux/tools/android" && if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch jq; fi && wget http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64.tar.bz2 -nv && - wget http://dl.google.com/android/android-sdk_r23.0.2-linux.tgz -nv; + wget http://dl.google.com/android/android-sdk_r24.0.2-linux.tgz -nv; fi # Building for Qt here - if [ "$BUILD_Qt" == "YES" ]; then @@ -37,9 +37,9 @@ install: fi - if [ "$BUILD_ANDROID" == "YES" ]; then tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2 && - tar -zxf android-sdk_r23.0.2-linux.tgz && + tar -zxf android-sdk_r24.0.2-linux.tgz && $ANDROID list sdk --extended -a && - echo yes | $ANDROID update sdk --filter tools,platform-tools,build-tools-21.1.1,android-10 --no-ui --force --no-https; + echo yes | $ANDROID update sdk --filter tools,platform-tools,build-tools-21.1.2,android-10 --no-ui --force --no-https; fi - sudo pip install pyjavaproperties - sudo pip install github3.py From 4985323ad900166295ae07649f225118d467acb2 Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Sat, 27 Dec 2014 01:29:58 +0100 Subject: [PATCH 3/9] Update .travis.yml Tweaked coveralls config --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index aeb3c6e93..b882ddf3a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,7 +54,7 @@ env: script: "tools/travis-script.sh" after_success: -- coveralls +- coveralls -e /usr/include -e JGE/src -e JGE/include -i projects/mtg/include -i projects/mtg/src - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l core.zip -r Wagic-core.zip -b $TRAVIS_BRANCH - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l projects/mtg/Android/bin/Wagic-debug.apk -r Wagic-android.apk -b $TRAVIS_BRANCH - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l projects/mtg/psprelease.zip -r Wagic-psp.zip -b $TRAVIS_BRANCH From 24eab33b6d229abfc1edc956896c6ffdb4d80bbe Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Sat, 27 Dec 2014 02:07:38 +0100 Subject: [PATCH 4/9] Update .travis.yml updating coveralls options --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b882ddf3a..89df04c5b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,7 +54,7 @@ env: script: "tools/travis-script.sh" after_success: -- coveralls -e /usr/include -e JGE/src -e JGE/include -i projects/mtg/include -i projects/mtg/src +- coveralls -b qt-gui-build -e JGE/src -e JGE/include -i projects/mtg/include -i projects/mtg/src --gcov-options '\-lp' - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l core.zip -r Wagic-core.zip -b $TRAVIS_BRANCH - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l projects/mtg/Android/bin/Wagic-debug.apk -r Wagic-android.apk -b $TRAVIS_BRANCH - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l projects/mtg/psprelease.zip -r Wagic-psp.zip -b $TRAVIS_BRANCH From 793c4d1d7d5654c5f6385eb4e5e0260a611d5819 Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Sat, 27 Dec 2014 10:39:16 +0100 Subject: [PATCH 5/9] Update .travis.yml Added some traces --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 89df04c5b..722603ab4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,6 +54,7 @@ env: script: "tools/travis-script.sh" after_success: +- du -a - coveralls -b qt-gui-build -e JGE/src -e JGE/include -i projects/mtg/include -i projects/mtg/src --gcov-options '\-lp' - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l core.zip -r Wagic-core.zip -b $TRAVIS_BRANCH - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l projects/mtg/Android/bin/Wagic-debug.apk -r Wagic-android.apk -b $TRAVIS_BRANCH From db922a0e773f36eb03631edbd98c56b3d573ce2c Mon Sep 17 00:00:00 2001 From: xawotihs Date: Sat, 27 Dec 2014 11:47:54 +0100 Subject: [PATCH 6/9] Activated perf logs with qt console config --- .travis.yml | 2 +- projects/mtg/wagic-qt.pro | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 722603ab4..896d5b5c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,7 +55,7 @@ script: "tools/travis-script.sh" after_success: - du -a -- coveralls -b qt-gui-build -e JGE/src -e JGE/include -i projects/mtg/include -i projects/mtg/src --gcov-options '\-lp' +- coveralls -e JGE/src -e JGE/include -i projects/mtg/include -i projects/mtg/src --gcov-options '\-lp' - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l core.zip -r Wagic-core.zip -b $TRAVIS_BRANCH - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l projects/mtg/Android/bin/Wagic-debug.apk -r Wagic-android.apk -b $TRAVIS_BRANCH - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l projects/mtg/psprelease.zip -r Wagic-psp.zip -b $TRAVIS_BRANCH diff --git a/projects/mtg/wagic-qt.pro b/projects/mtg/wagic-qt.pro index 2a11570d8..1aec3a977 100644 --- a/projects/mtg/wagic-qt.pro +++ b/projects/mtg/wagic-qt.pro @@ -12,6 +12,10 @@ CONFIG(console, graphics|console){ CONFIG += console CONFIG -= app_bundle DEFINES += TESTSUITE + + QMAKE_CXXFLAGS += -g -fprofile-arcs -ftest-coverage + QMAKE_LDFLAGS += -g -fprofile-arcs -ftest-coverage + LIBS += -lgcov } else:CONFIG(graphics, graphics|console){ folder_01.source = qml/QmlWagic @@ -21,10 +25,6 @@ else:CONFIG(graphics, graphics|console){ QT -= declarative quick qml DEFINES += QT_WIDGET unix:!symbian:INCLUDEPATH += /usr/include/GL - - QMAKE_CXXFLAGS += -g -fprofile-arcs -ftest-coverage - QMAKE_LDFLAGS += -g -fprofile-arcs -ftest-coverage - LIBS += -lgcov } #!android:!symbian:QT += phonon From ddd59c489a5bfab612171dcafc68d8a37a1797c2 Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Sat, 27 Dec 2014 12:17:03 +0100 Subject: [PATCH 7/9] Update .travis.yml trying to fix gcov root --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 896d5b5c6..11f9135ab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,7 +55,7 @@ script: "tools/travis-script.sh" after_success: - du -a -- coveralls -e JGE/src -e JGE/include -i projects/mtg/include -i projects/mtg/src --gcov-options '\-lp' +- coveralls -b . -e JGE/src -e JGE/include -i projects/mtg/include -i projects/mtg/src --gcov-options '\-lp' - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l core.zip -r Wagic-core.zip -b $TRAVIS_BRANCH - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l projects/mtg/Android/bin/Wagic-debug.apk -r Wagic-android.apk -b $TRAVIS_BRANCH - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l projects/mtg/psprelease.zip -r Wagic-psp.zip -b $TRAVIS_BRANCH From fcfab4c756445a2f47985acc9d0fdd403b93d66e Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Sat, 27 Dec 2014 13:43:38 +0100 Subject: [PATCH 8/9] Update .travis.yml Removed traces --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 11f9135ab..a34e11b85 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,7 +54,6 @@ env: script: "tools/travis-script.sh" after_success: -- du -a - coveralls -b . -e JGE/src -e JGE/include -i projects/mtg/include -i projects/mtg/src --gcov-options '\-lp' - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l core.zip -r Wagic-core.zip -b $TRAVIS_BRANCH - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l projects/mtg/Android/bin/Wagic-debug.apk -r Wagic-android.apk -b $TRAVIS_BRANCH From 8c2836b0c272e2eacf47c34d731baf51fcc82705 Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Mon, 29 Dec 2014 15:04:00 +0100 Subject: [PATCH 9/9] Update README.md Added coverage status --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f3eea73d2..83459c59f 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![Build Status](https://travis-ci.org/WagicProject/wagic.png?branch=master)](https://travis-ci.org/WagicProject/wagic) [![Build status](https://ci.appveyor.com/api/projects/status/7j4fbr6m62aqej59/branch/master)](https://ci.appveyor.com/project/xawotihs/wagic/branch/master) - +[![Coverage Status](https://coveralls.io/repos/WagicProject/wagic/badge.png?branch=master)](https://coveralls.io/r/WagicProject/wagic?branch=master) ## Description