Unity 8

Merge lp:~mzanetti/unity8/make-single-testfunction into lp:unity8

make-single-testfunction
Merge into trunk

Proposed by Michael Zanetti on 2014-02-05

Status:	Merged
Approved by:	Michał Sawicz on 2014-03-20
Approved revision:	656
Merged at revision:	786
Proposed branch:	lp:~mzanetti/unity8/make-single-testfunction
Merge into:	lp:unity8
Diff against target:	37 lines (+20/-7) 1 file modified cmake/modules/QmlTest.cmake (+20/-7)
To merge this branch:	bzr merge lp:~mzanetti/unity8/make-single-testfunction
Related bugs:	Link a bug report

Reviewer	Review Type	Status
Michał Sawicz		Approve on 2014-03-20
PS Jenkins bot (community)	continuous-integration	Approve on 2014-03-17
Michael Zanetti (community)		Needs Fixing on 2014-02-05
Review via email: mp+205035@code.launchpad.net

Commit message

allow executing a single test function

example:
make testShell FUNCTION="Shell::test_background"

Description of the change

* Are there any related MPs required for this MP to build/function as expected? Please list.

N/A

* Did you perform an exploratory manual test run of your code change and any related functionality?

Yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

N/A

* If you changed the UI, has there been a design review?

N/A

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2014-02-05:

breaks ninja :/

ninja wants $$ to accept the syntax but that breaks this feature again.

Any ideas anyone?

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-05:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2239/rebuild

review: Needs Fixing (continuous-integration)

lp:~mzanetti/unity8/make-single-testfunction updated on 2014-03-17

654. By Michael Zanetti on 2014-03-17: merge trunk, make it work with ninja too

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2014-03-17:

> breaks ninja :/

fixed

lp:~mzanetti/unity8/make-single-testfunction updated on 2014-03-17

655. By Michael Zanetti on 2014-03-17: make it case insensitive
656. By Michael Zanetti on 2014-03-17: enable it only for Unix Makefiles instead of disabling it for ninja

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-17:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2514/rebuild

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-17:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2520/rebuild

review: Approve (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-03-20:

Well.. OK.

I'm starting to wonder if we're not building too much into our CMake rules...

* Did you perform an exploratory manual test run of the code change and any related functionality?
Yes. Works!

* Did CI run pass? If not, please explain why.
Yes.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Michael Zanetti

Mohammad Rakibul Hasan

Unity Team

 === modified file 'cmake/modules/QmlTest.cmake'
 --- cmake/modules/QmlTest.cmake	2013-06-18 12:47:43 +0000
 +++ cmake/modules/QmlTest.cmake	2014-03-17 14:54:22 +0000
@@ -80,13 +80,26 @@
          endforeach(IMPORT_PATH)
      endif()
--    set(qmltest_command
--        env ${qmltest_ENVIRONMENT}
--        ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
--            ${qmltestrunner_imports}
--            -o ${CMAKE_BINARY_DIR}/${qmltest_TARGET}.xml,xunitxml
--            -o -,txt
--    )
++    string(TOLOWER "${CMAKE_GENERATOR}" cmake_generator_lower)
++    if(cmake_generator_lower STREQUAL "unix makefiles")
++        set(qmltest_command
++            env ${qmltest_ENVIRONMENT}
++            ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
++                ${qmltestrunner_imports}
++                -o ${CMAKE_BINARY_DIR}/${qmltest_TARGET}.xml,xunitxml
++                -o -,txt
++                $(FUNCTION)
++        )
++    else()
++        set(qmltest_command
++            env ${qmltest_ENVIRONMENT}
++            ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
++                ${qmltestrunner_imports}
++                -o ${CMAKE_BINARY_DIR}/${qmltest_TARGET}.xml,xunitxml
++                -o -,txt
++        )
++    endif()
++
      add_custom_target(${qmltest_TARGET} ${qmltest_command})
      if(NOT "${qmltest_PROPERTIES}" STREQUAL "")