1
=== modified file 'tests/CMakeLists.txt'
2
--- tests/CMakeLists.txt	2013-04-11 14:19:06 +0000
3
+++ tests/CMakeLists.txt	2013-04-12 13:31:24 +0000
4
@@ -1,9 +1,13 @@
6
1
# add_qml_test(component_name [NO_ADD_TEST] [NO_TARGETS] [TARGETS target1 target2] [IMPORT_PATH import_path] [PROPERTIES ...])
1
# add_qml_test(component_name [NO_ADD_TEST] [NO_TARGETS]
7
2
#              [TARGETS target1 [target2 [...]]]
8
3
#              [IMPORT_PATHS import_path1 [import_path2 [...]]
9
4
#              [PROPERTIES prop1 value1 [prop2 value2 [...]]])
10
5
#
11
2
# NO_ADD_TEST will prevent adding the test to the "make test" target
6
# NO_ADD_TEST will prevent adding the test to the "make test" target
12
3
# NO_TARGETS will prevent adding the test to any targets
7
# NO_TARGETS will prevent adding the test to any targets
13
4
# TARGETS lists the targets the test should be added to
8
# TARGETS lists the targets the test should be added to
16
5
# IMPORT_PATH will pass that path to qmltestrunner
9
# IMPORT_PATHS will pass those paths to qmltestrunner as "-import" arguments
17
6
# PROPERTIES will be set on the target and test target
10
# PROPERTIES will be set on the target and test target. See CMake's set_target_properties()
18
7
#
11
#
19
8
# To change/set a default value for the whole test suite, prior to calling add_qml_test, set:
12
# To change/set a default value for the whole test suite, prior to calling add_qml_test, set:
20
9
# qmltest_DEFAULT_NO_ADD_TEST (default: FALSE)
13
# qmltest_DEFAULT_NO_ADD_TEST (default: FALSE)
21
@@ -18,27 +22,29 @@
22
18
22
23
19
macro(add_qml_test COMPONENT_NAME)
23
macro(add_qml_test COMPONENT_NAME)
24
20
    set(options NO_ADD_TEST NO_TARGETS)
24
    set(options NO_ADD_TEST NO_TARGETS)
25
25
    set(multi_value_keywords IMPORT_PATHS TARGETS PROPERTIES)
26
21
26
28
22
    cmake_parse_arguments(qmltest "${options}" "IMPORT_PATH" "TARGETS" ${ARGN})
27
    cmake_parse_arguments(qmltest "${options}" "" "${multi_value_keywords}" ${ARGN})
29
23
28
30
24
    set(qmltest_TARGET test${COMPONENT_NAME})
29
    set(qmltest_TARGET test${COMPONENT_NAME})
31
25
    set(qmltest_FILE tst_${COMPONENT_NAME})
30
    set(qmltest_FILE tst_${COMPONENT_NAME})
32
26
31
44
27
    if("${qmltest_IMPORT_PATH}" STREQUAL "")
32
    set(qmltestrunner_imports "")
45
28
        add_custom_target(${qmltest_TARGET}
33
    if(NOT "${qmltest_IMPORT_PATHS}" STREQUAL "")
46
29
            ${qmltestrunner_exe}  -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
34
        foreach(IMPORT_PATH ${qmltest_IMPORT_PATHS})
47
30
                          -o ${CMAKE_BINARY_DIR}/${qmltest_TARGET}.xml,xunitxml
35
            list(APPEND qmltestrunner_imports "-import")
48
31
                          -o -,txt)
36
            list(APPEND qmltestrunner_imports ${IMPORT_PATH})
49
32
    else()
37
        endforeach(IMPORT_PATH)
39
33
        add_custom_target(${qmltest_TARGET}
40
34
            ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
41
35
                          -import ${qmltest_IMPORT_PATH}
42
36
                          -o ${CMAKE_BINARY_DIR}/${qmltest_TARGET}.xml,xunitxml
43
37
                          -o -,txt)
50
38
    endif()
38
    endif()
51
39
39
54
40
    if(NOT "${qmltest_UNPARSED_ARGUMENTS}" STREQUAL "")
40
    add_custom_target(${qmltest_TARGET}
55
41
        set_target_properties(${qmltest_TARGET} ${qmltest_PROPERTIES})
41
        ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
56
42
                      ${qmltestrunner_imports}
57
43
                      -o ${CMAKE_BINARY_DIR}/${qmltest_TARGET}.xml,xunitxml
58
44
                      -o -,txt)
59
45
60
46
    if(NOT "${qmltest_PROPERTIES}" STREQUAL "")
61
47
        set_target_properties(${qmltest_TARGET} PROPERTIES ${qmltest_PROPERTIES})
62
42
    elseif(NOT "${qmltest_DEFAULT_PROPERTIES}" STREQUAL "")
48
    elseif(NOT "${qmltest_DEFAULT_PROPERTIES}" STREQUAL "")
63
43
        set_target_properties(${qmltest_TARGET} ${qmltest_DEFAULT_PROPERTIES})
49
        set_target_properties(${qmltest_TARGET} ${qmltest_DEFAULT_PROPERTIES})
64
44
    endif()
50
    endif()
65
45
51
66
=== modified file 'tests/qmluitests/Components/CMakeLists.txt'
67
--- tests/qmluitests/Components/CMakeLists.txt	2013-04-09 21:36:17 +0000
68
+++ tests/qmluitests/Components/CMakeLists.txt	2013-04-12 13:31:24 +0000
69
@@ -1,5 +1,5 @@
70
1
add_qml_test(DraggingArea)
1
add_qml_test(DraggingArea)
72
2
add_qml_test(FilterGrid IMPORT_PATH ${CMAKE_BINARY_DIR}/plugins)
2
add_qml_test(FilterGrid IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)
73
3
add_qml_test(ResponsiveFlowView)
3
add_qml_test(ResponsiveFlowView)
74
4
add_qml_test(ResponsiveGridView)
4
add_qml_test(ResponsiveGridView)
75
5
add_qml_test(Revealer)
5
add_qml_test(Revealer)
76
6
6
77
=== modified file 'tests/qmluitests/Hud/CMakeLists.txt'
78
--- tests/qmluitests/Hud/CMakeLists.txt	2013-04-09 09:04:49 +0000
79
+++ tests/qmluitests/Hud/CMakeLists.txt	2013-04-12 13:31:24 +0000
80
@@ -1,3 +1,3 @@
81
1
add_subdirectory(qml)
1
add_subdirectory(qml)
82
2
2
84
3
add_qml_test(Hud IMPORT_PATH ${CMAKE_CURRENT_BINARY_DIR}/qml)
3
add_qml_test(Hud IMPORT_PATHS ${CMAKE_CURRENT_BINARY_DIR}/qml)
85
4
4
86
=== modified file 'tests/qmluitests/Panel/CMakeLists.txt'
87
--- tests/qmluitests/Panel/CMakeLists.txt	2013-04-12 08:37:35 +0000
88
+++ tests/qmluitests/Panel/CMakeLists.txt	2013-04-12 13:31:24 +0000
89
@@ -1,6 +1,6 @@
90
1
add_subdirectory(qml)
1
add_subdirectory(qml)
91
2
2
95
3
add_qml_test(IndicatorRow IMPORT_PATH ${CMAKE_CURRENT_BINARY_DIR}/qml)
3
add_qml_test(IndicatorRow IMPORT_PATHS ${CMAKE_CURRENT_BINARY_DIR}/qml)
96
4
add_qml_test(Indicators IMPORT_PATH ${CMAKE_CURRENT_BINARY_DIR}/qml)
4
add_qml_test(Indicators IMPORT_PATHS ${CMAKE_CURRENT_BINARY_DIR}/qml)
97
5
add_qml_test(Panel IMPORT_PATH ${CMAKE_CURRENT_BINARY_DIR}/qml)
5
add_qml_test(Panel IMPORT_PATHS ${CMAKE_CURRENT_BINARY_DIR}/qml)
98
6
add_qml_test(SearchIndicator)
6
add_qml_test(SearchIndicator)
Status:	Merged
Approved by:	Daniel d'Andrada on 2013-04-12
Approved revision:	no longer in the source branch.
Merged at revision:	588
Proposed branch:	lp:~dandrader/unity/phablet_improve_cmake_add_qml_test
Merge into:	lp:unity/phablet
Diff against target:	98 lines (+28/-22) 4 files modified tests/CMakeLists.txt (+23/-17) tests/qmluitests/Components/CMakeLists.txt (+1/-1) tests/qmluitests/Hud/CMakeLists.txt (+1/-1) tests/qmluitests/Panel/CMakeLists.txt (+3/-3)
To merge this branch:	bzr merge lp:~dandrader/unity/phablet_improve_cmake_add_qml_test
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-04-12
Michał Sawicz		2013-04-11	Approve on 2013-04-12
Review via email: mp+158386@code.launchpad.net