Merge lp:~dandrader/unity/phablet_improve_cmake_add_qml_test into lp:unity/phablet

[Daniel d'Andrada]

Improve add_qml_test() CMake function

- Improve its documentation
- Add support for multiple QML import paths
- Refactor implementation of PROPERTIES argument.
  Turn it into a multi-valued keyword.

Improve add_qml_test() CMake function

- Improve its documentation
- Add support for multiple QML import paths
- Refactor implementation of PROPERTIES argument. Turn it into a multi-valued keyword.

Needed by lp:~dandrader/unity/phablet_remove_fakes_from_qml

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:581
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/459/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/227
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/460
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/460/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/459
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/335
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/335/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/339

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

this failure should go away after lp:~saviq/unity/phablet.add-python3-dep gets merged

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:581
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/466/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/237/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/467
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/467/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/466
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/342
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/342/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/346
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/920

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:586
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/469/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/240/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/470
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/470/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/469
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/345
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/345/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/349
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/923

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:586
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/470/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/241/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/471
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/471/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/470
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/346
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/346/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/350
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/925

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:586
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/472/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/245
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/473
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/473/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/472
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/348
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/348/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/352
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/927

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

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

16 +# IMPORT_PATHS will pass that path to qmltestrunner as "-import" arguments
"those paths"

25 + set(multi_value_keywords "IMPORT_PATHS" "TARGETS" "PROPERTIES")
no need for the quotes

28 + cmake_parse_arguments(qmltest "${options}" "" "${multi_value_keywords}" ${ARGN})
rogue space

47 + list(APPEND qmltestrunner_imports "-import")
48 + list(APPEND qmltestrunner_imports ${IMPORT_PATH})
I would probably just go and set(var "${var} -import ${IMPORT_PATH}") here, but that's good, too

Just some nitpicks, otherwise good!

review: Needs Fixing

[Daniel d'Andrada (dandrader)]

> 16 +# IMPORT_PATHS will pass that path to qmltestrunner as "-import"
> arguments
> "those paths"

will fix

>
> 25 + set(multi_value_keywords "IMPORT_PATHS" "TARGETS" "PROPERTIES")
> no need for the quotes

will change

>
> 28 + cmake_parse_arguments(qmltest "${options}" ""
> "${multi_value_keywords}" ${ARGN})
> rogue space

This is not a rogue space. This is the argument for single-valued keywords, which we have none now.

>
> 47 + list(APPEND qmltestrunner_imports "-import")
> 48 + list(APPEND qmltestrunner_imports ${IMPORT_PATH})
> I would probably just go and set(var "${var} -import ${IMPORT_PATH}") here,
> but that's good, too

Appending has better performance. But I could probably merge the two in a single append command.

[Michał Sawicz (saviq)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:589
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/503/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/281
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/504
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/504/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/503
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/379
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/379/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/383
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/954

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

review: Approve (continuous-integration)

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2013-04-11 14:19:06 +0000
+++ tests/CMakeLists.txt	2013-04-12 13:31:24 +0000
@@ -1,9 +1,13 @@
-# add_qml_test(component_name [NO_ADD_TEST] [NO_TARGETS] [TARGETS target1 target2] [IMPORT_PATH import_path] [PROPERTIES ...])
+# add_qml_test(component_name [NO_ADD_TEST] [NO_TARGETS]
+#              [TARGETS target1 [target2 [...]]]
+#              [IMPORT_PATHS import_path1 [import_path2 [...]]
+#              [PROPERTIES prop1 value1 [prop2 value2 [...]]])
+#
 # NO_ADD_TEST will prevent adding the test to the "make test" target
 # NO_TARGETS will prevent adding the test to any targets
 # TARGETS lists the targets the test should be added to
-# IMPORT_PATH will pass that path to qmltestrunner
-# PROPERTIES will be set on the target and test target
+# IMPORT_PATHS will pass those paths to qmltestrunner as "-import" arguments
+# PROPERTIES will be set on the target and test target. See CMake's set_target_properties()
 #
 # To change/set a default value for the whole test suite, prior to calling add_qml_test, set:
 # qmltest_DEFAULT_NO_ADD_TEST (default: FALSE)
@@ -18,27 +22,29 @@
 
 macro(add_qml_test COMPONENT_NAME)
     set(options NO_ADD_TEST NO_TARGETS)
+    set(multi_value_keywords IMPORT_PATHS TARGETS PROPERTIES)
 
-    cmake_parse_arguments(qmltest "${options}" "IMPORT_PATH" "TARGETS" ${ARGN})
+    cmake_parse_arguments(qmltest "${options}" "" "${multi_value_keywords}" ${ARGN})
 
     set(qmltest_TARGET test${COMPONENT_NAME})
     set(qmltest_FILE tst_${COMPONENT_NAME})
 
-    if("${qmltest_IMPORT_PATH}" STREQUAL "")
-        add_custom_target(${qmltest_TARGET}
-            ${qmltestrunner_exe}  -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
-                          -o ${CMAKE_BINARY_DIR}/${qmltest_TARGET}.xml,xunitxml
-                          -o -,txt)
-    else()
-        add_custom_target(${qmltest_TARGET}
-            ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
-                          -import ${qmltest_IMPORT_PATH}
-                          -o ${CMAKE_BINARY_DIR}/${qmltest_TARGET}.xml,xunitxml
-                          -o -,txt)
+    set(qmltestrunner_imports "")
+    if(NOT "${qmltest_IMPORT_PATHS}" STREQUAL "")
+        foreach(IMPORT_PATH ${qmltest_IMPORT_PATHS})
+            list(APPEND qmltestrunner_imports "-import")
+            list(APPEND qmltestrunner_imports ${IMPORT_PATH})
+        endforeach(IMPORT_PATH)
     endif()
 
-    if(NOT "${qmltest_UNPARSED_ARGUMENTS}" STREQUAL "")
-        set_target_properties(${qmltest_TARGET} ${qmltest_PROPERTIES})
+    add_custom_target(${qmltest_TARGET}
+        ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
+                      ${qmltestrunner_imports}
+                      -o ${CMAKE_BINARY_DIR}/${qmltest_TARGET}.xml,xunitxml
+                      -o -,txt)
+
+    if(NOT "${qmltest_PROPERTIES}" STREQUAL "")
+        set_target_properties(${qmltest_TARGET} PROPERTIES ${qmltest_PROPERTIES})
     elseif(NOT "${qmltest_DEFAULT_PROPERTIES}" STREQUAL "")
         set_target_properties(${qmltest_TARGET} ${qmltest_DEFAULT_PROPERTIES})
     endif()

=== modified file 'tests/qmluitests/Components/CMakeLists.txt'
--- tests/qmluitests/Components/CMakeLists.txt	2013-04-09 21:36:17 +0000
+++ tests/qmluitests/Components/CMakeLists.txt	2013-04-12 13:31:24 +0000
@@ -1,5 +1,5 @@
 add_qml_test(DraggingArea)
-add_qml_test(FilterGrid IMPORT_PATH ${CMAKE_BINARY_DIR}/plugins)
+add_qml_test(FilterGrid IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)
 add_qml_test(ResponsiveFlowView)
 add_qml_test(ResponsiveGridView)
 add_qml_test(Revealer)

=== modified file 'tests/qmluitests/Hud/CMakeLists.txt'
--- tests/qmluitests/Hud/CMakeLists.txt	2013-04-09 09:04:49 +0000
+++ tests/qmluitests/Hud/CMakeLists.txt	2013-04-12 13:31:24 +0000
@@ -1,3 +1,3 @@
 add_subdirectory(qml)
 
-add_qml_test(Hud IMPORT_PATH ${CMAKE_CURRENT_BINARY_DIR}/qml)
+add_qml_test(Hud IMPORT_PATHS ${CMAKE_CURRENT_BINARY_DIR}/qml)

=== modified file 'tests/qmluitests/Panel/CMakeLists.txt'
--- tests/qmluitests/Panel/CMakeLists.txt	2013-04-12 08:37:35 +0000
+++ tests/qmluitests/Panel/CMakeLists.txt	2013-04-12 13:31:24 +0000
@@ -1,6 +1,6 @@
 add_subdirectory(qml)
 
-add_qml_test(IndicatorRow IMPORT_PATH ${CMAKE_CURRENT_BINARY_DIR}/qml)
-add_qml_test(Indicators IMPORT_PATH ${CMAKE_CURRENT_BINARY_DIR}/qml)
-add_qml_test(Panel IMPORT_PATH ${CMAKE_CURRENT_BINARY_DIR}/qml)
+add_qml_test(IndicatorRow IMPORT_PATHS ${CMAKE_CURRENT_BINARY_DIR}/qml)
+add_qml_test(Indicators IMPORT_PATHS ${CMAKE_CURRENT_BINARY_DIR}/qml)
+add_qml_test(Panel IMPORT_PATHS ${CMAKE_CURRENT_BINARY_DIR}/qml)
 add_qml_test(SearchIndicator)