Merge lp:~unity-team/unity/phablet.unittests_new-cmake into lp:unity/phablet

[Andrea Cimitan]

New CMakeLists for unittests allowing import paths.

New CMakeLists for unittests allowing import paths.

[Michał Sawicz (saviq)]

This means that "make test" nor "make check" will not run those tests, is that on purpose?

Why are we _not_ using add_test() in the macro and a custom target instead?

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:500
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/102/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/103
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/103/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/102
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/165

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/102/rebuild

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

Superseded by lp:~saviq/unity/phablet.flexible-cmake-macro/

review: Disapprove

Unmerged revisions

500. By Andrea Cimitan on 2013-03-20

Changed Test name for AnimationControllerWithSignals

499. By Andrea Cimitan on 2013-03-20

New CMakeLists.txt for unittests

=== modified file 'tests/unittests/CMakeLists.txt'
--- tests/unittests/CMakeLists.txt	2013-03-14 15:27:09 +0000
+++ tests/unittests/CMakeLists.txt	2013-03-20 15:13:38 +0000
@@ -1,2 +1,27 @@
-add_test(tst_QmlTests qmltestrunner -input ${CMAKE_SOURCE_DIR}/tests/unittests/ -o ${CMAKE_BINARY_DIR}/qmltestrun.xml,xunitxml -o -,txt)
-set_tests_properties(tst_QmlTests PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=minimal")
+add_custom_target(tests)
+
+# add_qml_test(COMPONENT_NAME [IMPORT_PATH])
+macro(add_qml_test COMPONENT_NAME)
+    if(${ARGC} EQUAL 1)
+        add_custom_target(test${COMPONENT_NAME}
+            qmltestrunner -input ${CMAKE_CURRENT_SOURCE_DIR}/tst_${COMPONENT_NAME}.qml
+                          -o ${CMAKE_BINARY_DIR}/test${COMPONENT_NAME}.xml,xunitxml
+                          -o -,txt)
+    else(${ARGC} EQUAL 1)
+        add_custom_target(test${COMPONENT_NAME}
+            qmltestrunner -input ${CMAKE_CURRENT_SOURCE_DIR}/tst_${COMPONENT_NAME}.qml
+                          -import ${ARGV1}
+                          -o ${CMAKE_BINARY_DIR}/test${COMPONENT_NAME}.xml,xunitxml
+                          -o -,txt)
+    endif(${ARGC} EQUAL 1)
+
+    set_target_properties(test${COMPONENT_NAME} PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=minimal")
+    add_dependencies(tests test${COMPONENT_NAME})
+endmacro(add_qml_test)
+
+add_qml_test(AnimationControllerWithSignals)
+add_qml_test(Carousel)
+add_qml_test(CrossFadeImage)
+add_qml_test(MathLocal)
+add_qml_test(RatingStars)
+add_qml_test(TimeLocal)

=== modified file 'tests/unittests/tst_AnimationControllerWithSignals.qml'
--- tests/unittests/tst_AnimationControllerWithSignals.qml	2013-03-14 12:32:50 +0000
+++ tests/unittests/tst_AnimationControllerWithSignals.qml	2013-03-20 15:13:38 +0000
@@ -20,7 +20,7 @@
 
 TestCase {
     id: testCase
-    name: "AnimationControllerWithSignals"
+    name: "AnimationControllerWithSignalsTest"
 
     property real someNumber: 0.0