Unity

Merge lp:~saviq/unity/phablet.flatten-qmltests into lp:unity/phablet

  1. phablet.flatten-qmltests
  2. Merge into phablet
Proposed by Michał Sawicz
Status: Merged
Approved by: Michael Zanetti
Approved revision: no longer in the source branch.
Merged at revision: 603
Proposed branch: lp:~saviq/unity/phablet.flatten-qmltests
Merge into: lp:unity/phablet
Diff against target: 478 lines (+139/-150)
26 files modified
CMakeLists.txt (+0/-1)
cmake/modules/QmlTest.cmake (+76/-0)
debian/rules (+0/-2)
tests/CMakeLists.txt (+8/-0)
tests/plugins/CMakeLists.txt (+1/-0)
tests/plugins/Utils/CMakeLists.txt (+1/-1)
tests/qmltests/CMakeLists.txt (+47/-82)
tests/qmltests/Greeter/tst_Clock.qml (+1/-1)
tests/qmltests/Panel/tst_IndicatorItem.qml (+1/-1)
tests/qmltests/README (+1/-1)
tests/qmltests/SideStage/tst_SideStage.qml (+1/-1)
tests/qmltests/plugins/CMakeLists.txt (+2/-1)
tests/qmluitests/CMakeLists.txt (+0/-11)
tests/qmluitests/Components/CMakeLists.txt (+0/-10)
tests/qmluitests/Dash/CMakeLists.txt (+0/-2)
tests/qmluitests/Greeter/CMakeLists.txt (+0/-1)
tests/qmluitests/Hud/CMakeLists.txt (+0/-3)
tests/qmluitests/Hud/qml/CMakeLists.txt (+0/-1)
tests/qmluitests/Launcher/CMakeLists.txt (+0/-1)
tests/qmluitests/Panel/CMakeLists.txt (+0/-7)
tests/qmluitests/Panel/qml/CMakeLists.txt (+0/-2)
tests/unittests/CMakeLists.txt (+0/-11)
tests/unittests/Components/CMakeLists.txt (+0/-7)
tests/unittests/Greeter/CMakeLists.txt (+0/-1)
tests/unittests/Panel/CMakeLists.txt (+0/-1)
tests/unittests/SideStage/CMakeLists.txt (+0/-1)
To merge this branch: bzr merge lp:~saviq/unity/phablet.flatten-qmltests
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Michael Zanetti (community) Approve
Unity Team Pending
Review via email: mp+159160@code.launchpad.net

Commit message

flatten qmluitests and unittests into qmltests to reduce the test management burden

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:605
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/559/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/354/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/560
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/560/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/559
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/435
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/435/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/439
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1055

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:606
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/561/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/356/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/562/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/561/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/437/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/441/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Michi Henning (michihenning) wrote :

 if("${qmltest_NO_ADD_TEST}" STREQUAL FALSE AND NOT "${qmltest_DEFAULT_NO_ADD_TEST}" STREQUAL "TRUE")
          add_test(${qmltest_TARGET} make ${qmltest_TARGET})

Calling make directly like this prevents building with other build tools, such as ninja. I think the correct way to do this is to a custom target with a DEPENDS. Jussi?

Revision history for this message
Michał Sawicz (saviq) wrote :

W dniu 17.04.2013 00:09, Michi Henning pisze:
> if("${qmltest_NO_ADD_TEST}" STREQUAL FALSE AND NOT "${qmltest_DEFAULT_NO_ADD_TEST}" STREQUAL "TRUE")
> add_test(${qmltest_TARGET} make ${qmltest_TARGET})
>
> Calling make directly like this prevents building with other build tools, such as ninja. I think the correct way to do this is to a custom target with a DEPENDS. Jussi?

Hmm indeed, we should just as well put the same command in there.

We also have

> enable_testing()
> add_custom_target(check make test CTEST_OUTPUT_ON_FAILURE=1)

in our root level CMakeLists.txt, to support the Debian "check" target.
We could indeed go with a dependency, but how do we pass the CTEST...
there? Or is it actually needed?

--
Michał Sawicz <email address hidden>
Canonical Services Ltd.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:607
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/578/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/373
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/579
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/579/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/578
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/454
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/454/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/458
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1074

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

review: Approve (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) wrote :

fixed on both accounts, although `${builder} check` will not spit out test errors by default now, I didn't find a way to set up ENVIRONMENT for all the tests.

Revision history for this message
Michael Zanetti (mzanetti) wrote :

> > add_custom_target(check make test CTEST_OUTPUT_ON_FAILURE=1)

> in our root level CMakeLists.txt, to support the Debian "check" target.
> We could indeed go with a dependency, but how do we pass the CTEST...
> there? Or is it actually needed?

I'd like to keep the CTEST_OUTPUT_ON_FAILURE, otherwise executing make check manually will be very cumbersome to debug when it fails.

I think you can set it via:

target_set_properties(check ENVIRONMENT CTEST_OUTPUT_ON_FAILURE=1)

(not sure on the syntax but you get the idea... export it to the environment)

Revision history for this message
Michael Zanetti (mzanetti) wrote :

My understanding is that this is to simplify creating new tests etc. The tests/qmltests/CMakeLists.txt grew to a huge thing by now. Can we move the macro definition (add_qmltest) to a cmake module to only have the list of add_qml_test() calls in this file?

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:608
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/580/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/375
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/581
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/581/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/580
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/456
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/456/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/460
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1077

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

review: Approve (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) wrote :

Unfortunately properties of targets don't propagate to their DEPENDS, so setting them on check does not actually help.

I've split the macro to a module now.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:609
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/582/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/377
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/583
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/583/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/582
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/458
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/458/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/462
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1081

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

review: Approve (continuous-integration)
Revision history for this message
Michael Zanetti (mzanetti) wrote :

lgtm now

review: Approve
Revision history for this message
Michael Zanetti (mzanetti) wrote :

still good. love the Makefile!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-phablet-autolanding/212/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/380/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-autolanding/212/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-autolanding/212/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/146/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-autolanding/146/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Michael Zanetti (mzanetti) wrote :

too bad... rest is still ok

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:611
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/585/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/381
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/586/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/585/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/461/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/465/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2013-04-15 01:30:58 +0000
+++ CMakeLists.txt 2013-04-17 12:05:31 +0000
@@ -109,7 +109,6 @@
109109
110# Tests110# Tests
111enable_testing()111enable_testing()
112add_custom_target(check make test CTEST_OUTPUT_ON_FAILURE=1)
113112
114# Autopilot tests113# Autopilot tests
115include(autopilot)114include(autopilot)
116115
=== added file 'cmake/modules/QmlTest.cmake'
--- cmake/modules/QmlTest.cmake 1970-01-01 00:00:00 +0000
+++ cmake/modules/QmlTest.cmake 2013-04-17 12:05:31 +0000
@@ -0,0 +1,76 @@
1# add_qml_test(path component_name [NO_ADD_TEST] [NO_TARGETS]
2# [TARGETS target1 [target2 [...]]]
3# [IMPORT_PATHS import_path1 [import_path2 [...]]
4# [PROPERTIES prop1 value1 [prop2 value2 [...]]])
5#
6# NO_ADD_TEST will prevent adding the test to the "test" target
7# NO_TARGETS will prevent adding the test to any targets
8# TARGETS lists the targets the test should be added to
9# IMPORT_PATHS will pass those paths to qmltestrunner as "-import" arguments
10# PROPERTIES will be set on the target and test target. See CMake's set_target_properties()
11#
12# To change/set a default value for the whole test suite, prior to calling add_qml_test, set:
13# qmltest_DEFAULT_NO_ADD_TEST (default: FALSE)
14# qmltest_DEFAULT_TARGETS
15# qmltest_DEFAULT_PROPERTIES
16
17find_program(qmltestrunner_exe qmltestrunner)
18
19if(NOT qmltestrunner_exe)
20 msg(FATAL_ERROR "Could not locate qmltestrunner.")
21endif()
22
23macro(add_qml_test SUBPATH COMPONENT_NAME)
24 set(options NO_ADD_TEST NO_TARGETS)
25 set(multi_value_keywords IMPORT_PATHS TARGETS PROPERTIES)
26
27 cmake_parse_arguments(qmltest "${options}" "" "${multi_value_keywords}" ${ARGN})
28
29 set(qmltest_TARGET test${COMPONENT_NAME})
30 set(qmltest_FILE ${SUBPATH}/tst_${COMPONENT_NAME})
31
32 set(qmltestrunner_imports "")
33 if(NOT "${qmltest_IMPORT_PATHS}" STREQUAL "")
34 foreach(IMPORT_PATH ${qmltest_IMPORT_PATHS})
35 list(APPEND qmltestrunner_imports "-import")
36 list(APPEND qmltestrunner_imports ${IMPORT_PATH})
37 endforeach(IMPORT_PATH)
38 endif()
39
40 set(qmltest_command
41 ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
42 ${qmltestrunner_imports}
43 -o ${CMAKE_BINARY_DIR}/${qmltest_TARGET}.xml,xunitxml
44 -o -,txt
45 )
46
47 add_custom_target(${qmltest_TARGET} ${qmltest_command})
48
49 if(NOT "${qmltest_PROPERTIES}" STREQUAL "")
50 set_target_properties(${qmltest_TARGET} PROPERTIES ${qmltest_PROPERTIES})
51 elseif(NOT "${qmltest_DEFAULT_PROPERTIES}" STREQUAL "")
52 set_target_properties(${qmltest_TARGET} PROPERTIES ${qmltest_DEFAULT_PROPERTIES})
53 endif()
54
55 if("${qmltest_NO_ADD_TEST}" STREQUAL FALSE AND NOT "${qmltest_DEFAULT_NO_ADD_TEST}" STREQUAL "TRUE")
56 add_test(${qmltest_TARGET} ${qmltest_command})
57
58 if(NOT "${qmltest_UNPARSED_ARGUMENTS}" STREQUAL "")
59 set_tests_properties(${qmltest_TARGET} PROPERTIES ${qmltest_PROPERTIES})
60 elseif(NOT "${qmltest_DEFAULT_PROPERTIES}" STREQUAL "")
61 set_tests_properties(${qmltest_TARGET} PROPERTIES ${qmltest_DEFAULT_PROPERTIES})
62 endif()
63 endif("${qmltest_NO_ADD_TEST}" STREQUAL FALSE AND NOT "${qmltest_DEFAULT_NO_ADD_TEST}" STREQUAL "TRUE")
64
65 if("${qmltest_NO_TARGETS}" STREQUAL "FALSE")
66 if(NOT "${qmltest_TARGETS}" STREQUAL "")
67 foreach(TARGET ${qmltest_TARGETS})
68 add_dependencies(${TARGET} ${qmltest_TARGET})
69 endforeach(TARGET)
70 elseif(NOT "${qmltest_DEFAULT_TARGETS}" STREQUAL "")
71 foreach(TARGET ${qmltest_DEFAULT_TARGETS})
72 add_dependencies(${TARGET} ${qmltest_TARGET})
73 endforeach(TARGET)
74 endif()
75 endif("${qmltest_NO_TARGETS}" STREQUAL "FALSE")
76endmacro(add_qml_test)
077
=== modified file 'debian/rules'
--- debian/rules 2013-02-07 12:18:24 +0000
+++ debian/rules 2013-04-17 12:05:31 +0000
@@ -10,5 +10,3 @@
1010
11override_dh_install:11override_dh_install:
12 dh_install --fail-missing12 dh_install --fail-missing
13
14
1513
=== added file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ tests/CMakeLists.txt 2013-04-17 12:05:31 +0000
@@ -0,0 +1,8 @@
1add_custom_target(alltests)
2add_dependencies(alltests check)
3
4add_subdirectory(gtest)
5add_subdirectory(qmltests)
6add_subdirectory(whitespace)
7add_subdirectory(cleanincludes)
8add_subdirectory(plugins)
09
=== added directory 'tests/plugins'
=== added file 'tests/plugins/CMakeLists.txt'
--- tests/plugins/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ tests/plugins/CMakeLists.txt 2013-04-17 12:05:31 +0000
@@ -0,0 +1,1 @@
1add_subdirectory(Utils)
02
=== renamed directory 'tests/unittests/plugins/Utils' => 'tests/plugins/Utils'
=== modified file 'tests/plugins/Utils/CMakeLists.txt'
--- tests/unittests/plugins/Utils/CMakeLists.txt 2013-04-12 07:49:37 +0000
+++ tests/plugins/Utils/CMakeLists.txt 2013-04-17 12:05:31 +0000
@@ -1,6 +1,6 @@
1include_directories(1include_directories(
2 ${UtilsQmlPlugin_SOURCE_DIR}2 ${UtilsQmlPlugin_SOURCE_DIR}
3 ${CMAKE_CURRENT_SOURCE_DIR}/../../../../plugins/Utils3 ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/Utils
4 ${CMAKE_CURRENT_BINARY_DIR}4 ${CMAKE_CURRENT_BINARY_DIR}
5 )5 )
66
77
=== renamed directory 'tests/qmluitests' => 'tests/qmltests'
=== renamed file 'tests/CMakeLists.txt' => 'tests/qmltests/CMakeLists.txt'
--- tests/CMakeLists.txt 2013-04-12 13:21:01 +0000
+++ tests/qmltests/CMakeLists.txt 2013-04-17 12:05:31 +0000
@@ -1,83 +1,48 @@
1# add_qml_test(component_name [NO_ADD_TEST] [NO_TARGETS]1# add_qml_test macro
2# [TARGETS target1 [target2 [...]]]2include(QmlTest)
3# [IMPORT_PATHS import_path1 [import_path2 [...]]3
4# [PROPERTIES prop1 value1 [prop2 value2 [...]]])
5#
6# NO_ADD_TEST will prevent adding the test to the "make test" target
7# NO_TARGETS will prevent adding the test to any targets
8# TARGETS lists the targets the test should be added to
9# IMPORT_PATHS will pass those paths to qmltestrunner as "-import" arguments
10# PROPERTIES will be set on the target and test target. See CMake's set_target_properties()
11#
12# To change/set a default value for the whole test suite, prior to calling add_qml_test, set:
13# qmltest_DEFAULT_NO_ADD_TEST (default: FALSE)
14# qmltest_DEFAULT_TARGETS
15# qmltest_DEFAULT_PROPERTIES
16
17find_program(qmltestrunner_exe qmltestrunner)
18
19if(NOT qmltestrunner_exe)
20 msg(FATAL_ERROR "Could not locate qmltestrunner.")
21endif()
22
23macro(add_qml_test COMPONENT_NAME)
24 set(options NO_ADD_TEST NO_TARGETS)
25 set(multi_value_keywords IMPORT_PATHS TARGETS PROPERTIES)
26
27 cmake_parse_arguments(qmltest "${options}" "" "${multi_value_keywords}" ${ARGN})
28
29 set(qmltest_TARGET test${COMPONENT_NAME})
30 set(qmltest_FILE tst_${COMPONENT_NAME})
31
32 set(qmltestrunner_imports "")
33 if(NOT "${qmltest_IMPORT_PATHS}" STREQUAL "")
34 foreach(IMPORT_PATH ${qmltest_IMPORT_PATHS})
35 list(APPEND qmltestrunner_imports "-import")
36 list(APPEND qmltestrunner_imports ${IMPORT_PATH})
37 endforeach(IMPORT_PATH)
38 endif()
39
40 add_custom_target(${qmltest_TARGET}
41 ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
42 ${qmltestrunner_imports}
43 -o ${CMAKE_BINARY_DIR}/${qmltest_TARGET}.xml,xunitxml
44 -o -,txt)
45
46 if(NOT "${qmltest_PROPERTIES}" STREQUAL "")
47 set_target_properties(${qmltest_TARGET} PROPERTIES ${qmltest_PROPERTIES})
48 elseif(NOT "${qmltest_DEFAULT_PROPERTIES}" STREQUAL "")
49 set_target_properties(${qmltest_TARGET} ${qmltest_DEFAULT_PROPERTIES})
50 endif()
51
52 if("${qmltest_NO_ADD_TEST}" STREQUAL FALSE AND NOT "${qmltest_DEFAULT_NO_ADD_TEST}" STREQUAL "TRUE")
53 add_test(${qmltest_TARGET} make ${qmltest_TARGET})
54
55 if(NOT "${qmltest_UNPARSED_ARGUMENTS}" STREQUAL "")
56 set_tests_properties(${qmltest_TARGET} ${qmltest_PROPERTIES})
57 elseif(NOT "${qmltest_DEFAULT_PROPERTIES}" STREQUAL "")
58 set_tests_properties(${qmltest_TARGET} ${qmltest_DEFAULT_PROPERTIES})
59 endif()
60 endif("${qmltest_NO_ADD_TEST}" STREQUAL FALSE AND NOT "${qmltest_DEFAULT_NO_ADD_TEST}" STREQUAL "TRUE")
61
62 if("${qmltest_NO_TARGETS}" STREQUAL "FALSE")
63 if(NOT "${qmltest_TARGETS}" STREQUAL "")
64 foreach(TARGET ${qmltest_TARGETS})
65 add_dependencies(${TARGET} ${qmltest_TARGET})
66 endforeach(TARGET)
67 elseif(NOT "${qmltest_DEFAULT_TARGETS}" STREQUAL "")
68 foreach(TARGET ${qmltest_DEFAULT_TARGETS})
69 add_dependencies(${TARGET} ${qmltest_TARGET})
70 endforeach(TARGET)
71 endif()
72 endif("${qmltest_NO_TARGETS}" STREQUAL "FALSE")
73endmacro(add_qml_test)
74
75add_custom_target(alltests)
76add_custom_target(qmltests)4add_custom_target(qmltests)
77add_dependencies(alltests check qmltests)5add_custom_target(qmlunittests)
786add_custom_target(qmluitests)
79add_subdirectory(gtest)7
80add_subdirectory(unittests)8add_dependencies(alltests qmltests)
81add_subdirectory(qmluitests)9
82add_subdirectory(whitespace)10add_subdirectory(plugins)
83add_subdirectory(cleanincludes)11
12set(qmltest_DEFAULT_TARGETS qmlunittests qmltests)
13set(qmltest_DEFAULT_NO_ADD_TEST FALSE)
14set(qmltest_DEFAULT_PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=minimal")
15add_qml_test(Components AnimationControllerWithSignals)
16add_qml_test(Components Carousel)
17add_qml_test(Components CrossFadeImage)
18add_qml_test(Components MathLocal)
19add_qml_test(Components OpenEffect)
20add_qml_test(Components RatingStars)
21add_qml_test(Components TimeLocal)
22add_qml_test(Greeter Clock)
23add_qml_test(Panel IndicatorItem)
24
25set(qmltest_DEFAULT_TARGETS qmluitests qmltests)
26set(qmltest_DEFAULT_NO_ADD_TEST TRUE)
27set(qmltest_DEFAULT_PROPERTIES "")
28add_qml_test(Components DraggingArea)
29add_qml_test(Components FilterGrid IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)
30add_qml_test(Components ListViewWithPageHeader)
31add_qml_test(Components ResponsiveFlowView)
32add_qml_test(Components ResponsiveGridView)
33add_qml_test(Components Revealer)
34add_qml_test(Components Showable)
35add_qml_test(Components Stage)
36add_qml_test(Components Tile)
37add_qml_test(Components PageHeader)
38add_qml_test(Dash DashPreview)
39add_qml_test(Dash PeoplePreview)
40add_qml_test(Greeter Greeter)
41add_qml_test(Hud Hud IMPORT_PATHS ${CMAKE_CURRENT_BINARY_DIR}/plugins)
42add_qml_test(Launcher Launcher)
43add_qml_test(Panel IndicatorRow IMPORT_PATHS ${CMAKE_CURRENT_BINARY_DIR}/plugins)
44add_qml_test(Panel Indicators IMPORT_PATHS ${CMAKE_CURRENT_BINARY_DIR}/plugins)
45add_qml_test(Panel Panel IMPORT_PATHS ${CMAKE_CURRENT_BINARY_DIR}/plugins)
46add_qml_test(Panel SearchIndicator)
47add_qml_test(Panel Overview)
48add_qml_test(SideStage SideStage)
8449
=== renamed file 'tests/unittests/Components/tst_AnimationControllerWithSignals.qml' => 'tests/qmltests/Components/tst_AnimationControllerWithSignals.qml'
=== renamed file 'tests/unittests/Components/tst_Carousel.qml' => 'tests/qmltests/Components/tst_Carousel.qml'
=== renamed file 'tests/unittests/Components/tst_CrossFadeImage.qml' => 'tests/qmltests/Components/tst_CrossFadeImage.qml'
=== renamed file 'tests/unittests/Components/tst_MathLocal.qml' => 'tests/qmltests/Components/tst_MathLocal.qml'
=== renamed file 'tests/unittests/Components/tst_OpenEffect.qml' => 'tests/qmltests/Components/tst_OpenEffect.qml'
=== renamed file 'tests/unittests/Components/tst_RatingStars.qml' => 'tests/qmltests/Components/tst_RatingStars.qml'
=== renamed file 'tests/unittests/Components/tst_TimeLocal.qml' => 'tests/qmltests/Components/tst_TimeLocal.qml'
=== renamed file 'tests/unittests/Greeter/tst_Clock.qml' => 'tests/qmltests/Greeter/tst_Clock.qml'
--- tests/unittests/Greeter/tst_Clock.qml 2013-04-10 11:09:44 +0000
+++ tests/qmltests/Greeter/tst_Clock.qml 2013-04-17 12:05:31 +0000
@@ -16,7 +16,7 @@
1616
17import QtQuick 2.017import QtQuick 2.0
18import QtTest 1.018import QtTest 1.0
19import "../../qmluitests"19import ".."
20import "../../../Greeter"20import "../../../Greeter"
21import Ubuntu.Components 0.121import Ubuntu.Components 0.1
2222
2323
=== renamed file 'tests/unittests/Panel/tst_IndicatorItem.qml' => 'tests/qmltests/Panel/tst_IndicatorItem.qml'
--- tests/unittests/Panel/tst_IndicatorItem.qml 2013-04-09 17:31:41 +0000
+++ tests/qmltests/Panel/tst_IndicatorItem.qml 2013-04-17 12:05:31 +0000
@@ -16,7 +16,7 @@
1616
17import QtQuick 2.017import QtQuick 2.0
18import QtTest 1.018import QtTest 1.0
19import "../../qmluitests"19import ".."
20import "../../../Panel"20import "../../../Panel"
21import Ubuntu.Components 0.121import Ubuntu.Components 0.1
2222
2323
=== renamed file 'tests/README' => 'tests/qmltests/README'
--- tests/README 2013-04-09 15:43:55 +0000
+++ tests/qmltests/README 2013-04-17 12:05:31 +0000
@@ -4,7 +4,7 @@
4General guidelines4General guidelines
5==================5==================
66
7Tests under qmluitests dir should be designed in a way that they can be run either7Tests under qmluitests target should be designed in a way that they can be run either
8automatically (with qmltestrunner) or manually (with qmlscene). So make sure you8automatically (with qmltestrunner) or manually (with qmlscene). So make sure you
9add UI controls for manual interaction and labels for monitoring output when needed.9add UI controls for manual interaction and labels for monitoring output when needed.
1010
1111
=== renamed directory 'tests/unittests/SideStage' => 'tests/qmltests/SideStage'
=== modified file 'tests/qmltests/SideStage/tst_SideStage.qml'
--- tests/unittests/SideStage/tst_SideStage.qml 2013-04-10 23:56:47 +0000
+++ tests/qmltests/SideStage/tst_SideStage.qml 2013-04-17 12:05:31 +0000
@@ -16,7 +16,7 @@
1616
17import QtQuick 2.017import QtQuick 2.0
18import QtTest 1.018import QtTest 1.0
19import "../../qmluitests/"19import ".."
20import "../../../SideStage"20import "../../../SideStage"
21import Ubuntu.Components 0.121import Ubuntu.Components 0.1
2222
2323
=== renamed directory 'tests/unittests/plugins' => 'tests/qmltests/plugins'
=== modified file 'tests/qmltests/plugins/CMakeLists.txt'
--- tests/unittests/plugins/CMakeLists.txt 2013-04-11 13:23:00 +0000
+++ tests/qmltests/plugins/CMakeLists.txt 2013-04-17 12:05:31 +0000
@@ -1,1 +1,2 @@
1add_subdirectory(Utils)
2\ No newline at end of file1\ No newline at end of file
2add_subdirectory(HudClient)
3add_subdirectory(Ubuntu)
34
=== renamed directory 'tests/qmluitests/Hud/qml/HudClient' => 'tests/qmltests/plugins/HudClient'
=== renamed directory 'tests/qmluitests/Panel/qml/Ubuntu' => 'tests/qmltests/plugins/Ubuntu'
=== removed file 'tests/qmluitests/CMakeLists.txt'
--- tests/qmluitests/CMakeLists.txt 2013-04-12 15:01:54 +0000
+++ tests/qmluitests/CMakeLists.txt 1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
1add_custom_target(qmluitests)
2
3set(qmltest_DEFAULT_TARGETS qmluitests qmltests)
4set(qmltest_DEFAULT_NO_ADD_TEST TRUE)
5
6add_subdirectory(Components)
7add_subdirectory(Dash)
8add_subdirectory(Greeter)
9add_subdirectory(Hud)
10add_subdirectory(Panel)
11add_subdirectory(Launcher)
120
=== removed file 'tests/qmluitests/Components/CMakeLists.txt'
--- tests/qmluitests/Components/CMakeLists.txt 2013-04-12 15:09:41 +0000
+++ tests/qmluitests/Components/CMakeLists.txt 1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
1add_qml_test(DraggingArea)
2add_qml_test(FilterGrid IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)
3add_qml_test(ListViewWithPageHeader)
4add_qml_test(ResponsiveFlowView)
5add_qml_test(ResponsiveGridView)
6add_qml_test(Revealer)
7add_qml_test(Showable)
8add_qml_test(Stage)
9add_qml_test(Tile)
10add_qml_test(PageHeader)
110
=== removed file 'tests/qmluitests/Dash/CMakeLists.txt'
--- tests/qmluitests/Dash/CMakeLists.txt 2013-04-11 15:05:45 +0000
+++ tests/qmluitests/Dash/CMakeLists.txt 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
1add_qml_test(DashPreview)
2add_qml_test(PeoplePreview)
30
=== removed file 'tests/qmluitests/Greeter/CMakeLists.txt'
--- tests/qmluitests/Greeter/CMakeLists.txt 2013-04-10 09:33:47 +0000
+++ tests/qmluitests/Greeter/CMakeLists.txt 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1add_qml_test(Greeter)
20
=== removed file 'tests/qmluitests/Hud/CMakeLists.txt'
--- tests/qmluitests/Hud/CMakeLists.txt 2013-04-12 12:49:20 +0000
+++ tests/qmluitests/Hud/CMakeLists.txt 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
1add_subdirectory(qml)
2
3add_qml_test(Hud IMPORT_PATHS ${CMAKE_CURRENT_BINARY_DIR}/qml)
40
=== removed directory 'tests/qmluitests/Hud/qml'
=== removed file 'tests/qmluitests/Hud/qml/CMakeLists.txt'
--- tests/qmluitests/Hud/qml/CMakeLists.txt 2013-04-12 08:37:35 +0000
+++ tests/qmluitests/Hud/qml/CMakeLists.txt 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1add_subdirectory(HudClient)
20
=== removed file 'tests/qmluitests/Launcher/CMakeLists.txt'
--- tests/qmluitests/Launcher/CMakeLists.txt 2013-04-08 17:08:40 +0000
+++ tests/qmluitests/Launcher/CMakeLists.txt 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1add_qml_test(Launcher)
20
=== removed file 'tests/qmluitests/Panel/CMakeLists.txt'
--- tests/qmluitests/Panel/CMakeLists.txt 2013-04-12 15:20:47 +0000
+++ tests/qmluitests/Panel/CMakeLists.txt 1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
1add_subdirectory(qml)
2
3add_qml_test(IndicatorRow IMPORT_PATHS ${CMAKE_CURRENT_BINARY_DIR}/qml)
4add_qml_test(Indicators IMPORT_PATHS ${CMAKE_CURRENT_BINARY_DIR}/qml)
5add_qml_test(Panel IMPORT_PATHS ${CMAKE_CURRENT_BINARY_DIR}/qml)
6add_qml_test(SearchIndicator)
7add_qml_test(Overview)
80
=== removed directory 'tests/qmluitests/Panel/qml'
=== removed file 'tests/qmluitests/Panel/qml/CMakeLists.txt'
--- tests/qmluitests/Panel/qml/CMakeLists.txt 2013-04-12 08:37:35 +0000
+++ tests/qmluitests/Panel/qml/CMakeLists.txt 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
1add_subdirectory(Ubuntu)
2
30
=== removed directory 'tests/unittests'
=== removed file 'tests/unittests/CMakeLists.txt'
--- tests/unittests/CMakeLists.txt 2013-04-12 15:27:55 +0000
+++ tests/unittests/CMakeLists.txt 1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
1add_custom_target(unittests)
2
3set(qmltest_DEFAULT_TARGETS unittests qmltests)
4set(qmltest_DEFAULT_PROPERTIES PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=minimal")
5
6add_subdirectory(Components)
7add_subdirectory(Greeter)
8add_subdirectory(Panel)
9add_subdirectory(SideStage)
10add_subdirectory(plugins)
11
120
=== removed directory 'tests/unittests/Components'
=== removed file 'tests/unittests/Components/CMakeLists.txt'
--- tests/unittests/Components/CMakeLists.txt 2013-04-11 13:45:53 +0000
+++ tests/unittests/Components/CMakeLists.txt 1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
1add_qml_test(AnimationControllerWithSignals)
2add_qml_test(Carousel)
3add_qml_test(CrossFadeImage)
4add_qml_test(MathLocal)
5add_qml_test(OpenEffect)
6add_qml_test(RatingStars)
7add_qml_test(TimeLocal)
80
=== removed directory 'tests/unittests/Greeter'
=== removed file 'tests/unittests/Greeter/CMakeLists.txt'
--- tests/unittests/Greeter/CMakeLists.txt 2013-04-10 09:33:47 +0000
+++ tests/unittests/Greeter/CMakeLists.txt 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1add_qml_test(Clock)
20
=== removed directory 'tests/unittests/Panel'
=== removed file 'tests/unittests/Panel/CMakeLists.txt'
--- tests/unittests/Panel/CMakeLists.txt 2013-04-09 17:27:03 +0000
+++ tests/unittests/Panel/CMakeLists.txt 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1add_qml_test(IndicatorItem)
20
=== removed file 'tests/unittests/SideStage/CMakeLists.txt'
--- tests/unittests/SideStage/CMakeLists.txt 2013-04-09 17:14:48 +0000
+++ tests/unittests/SideStage/CMakeLists.txt 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1add_qml_test(SideStage)

Subscribers

People subscribed via source and target branches