Merge lp:~mzanetti/unity/more-stats into lp:unity/phablet

[Michael Zanetti]

generate more test statistics

* adjusts the coverage part of CMakeLists.txt to our other projects and makes it discoverable by our jenkins hooks
* enables test result file generation for plugins/Utils
* makes a randomly failing greeter test more robust
* renames coverage.xml for qml to avoid clashing with real lcov/gcov generated file

* adjusts the coverage part of CMakeLists.txt to our other projects and makes it discoverable by our jenkins hooks
* enables test result file generation for plugins/Utils
* makes a randomly failing greeter test more robust
* renames coverage.xml for qml to avoid clashing with real lcov/gcov generated file

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:528
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/298/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/299
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/299/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/298
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/174
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/174/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/174
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/681

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/298/rebuild

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

review: Approve

[Michał Sawicz (saviq)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:529
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/319/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/320
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/320/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/319
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/195
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/195/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/195
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/710

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/319/rebuild

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-04-04 12:41:50 +0000
+++ CMakeLists.txt	2013-04-08 08:12:19 +0000
@@ -7,8 +7,8 @@
 set(CMAKE_AUTOMOC ON)
 
 # enable QML debugging
-string(TOLOWER "${CMAKE_BUILD_TYPE}" buildtype_lower) # Build types should always be lowercase but sometimes they are not.
-if(buildtype_lower MATCHES "debug")
+string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_lower) # Build types should always be lowercase but sometimes they are not.
+if(cmake_build_type_lower MATCHES "debug")
     add_definitions(-DQT_QML_DEBUG)
 endif()
 
@@ -22,7 +22,7 @@
 #  * Find html report in subdir coveragereport
 #  * Find xml report feasible for jenkins in coverage.xml
 #####################################################################
-if(buildtype_lower MATCHES coverage)
+if(cmake_build_type_lower MATCHES coverage)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage" )
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --coverage" )
   set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} --coverage" )

=== modified file 'plugins/Utils/tests/CMakeLists.txt'
--- plugins/Utils/tests/CMakeLists.txt	2013-03-28 15:26:58 +0000
+++ plugins/Utils/tests/CMakeLists.txt	2013-04-08 08:12:19 +0000
@@ -9,6 +9,8 @@
     foreach(_test ${ARGN})
         add_test(NAME ${_test} 
             COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${_test}
+              -o ${CMAKE_BINARY_DIR}/${_test}.xml,xunitxml
+              -o -,txt
             )
         add_executable(${_test} ${_test}.cpp)
         qt5_use_modules(${_test} Test Core Qml)

=== modified file 'runtests.sh'
--- runtests.sh	2013-04-05 10:58:29 +0000
+++ runtests.sh	2013-04-08 08:12:19 +0000
@@ -79,7 +79,7 @@
 
 cd -
 
-coveragefile=coverage.xml
+coveragefile=coverage-qml.xml
 
 echo "<?xml version=\"1.0\" ?>" > $coveragefile
 echo "<!DOCTYPE coverage" >> $coveragefile

=== modified file 'tests/qmluitests/tst_Greeter.qml'
--- tests/qmluitests/tst_Greeter.qml	2013-03-26 20:05:18 +0000
+++ tests/qmluitests/tst_Greeter.qml	2013-04-08 08:12:19 +0000
@@ -70,10 +70,10 @@
             var account = findChild(greeter, "username1")
             mouseClick(account, 1, 1)
             account = findChild(greeter, "username0")
-            mouseClick(account, 1, 1)
             var passwordInput = findChild(greeter, "passwordInput")
-            tryCompare(passwordInput, "opacity", 0)
-            tryCompare(passwordInput, "opacity", 1)
+            mouseClick(account, 1, 1)
+            wait(0) // spin event loop to start any pending animations
+            tryCompare(passwordInput, "opacity", 1) // wait for opacity animation to be finished
             mouseClick(passwordInput, 1, 1)
             compare(unlockSpy.count, 0)
             typeString("wr0ng p4ssw0rd")