Merge lp:~dobey/ubuntu-purchase-service/fix-tests into lp:ubuntu-purchase-service

Proposed by dobey on 2014-03-06
Status: Merged
Approved by: dobey on 2014-03-07
Approved revision: 17
Merged at revision: 16
Proposed branch: lp:~dobey/ubuntu-purchase-service/fix-tests
Merge into: lp:ubuntu-purchase-service
Diff against target: 20 lines (+2/-2)
2 files modified
.bzrignore (+1/-1)
src/tests/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~dobey/ubuntu-purchase-service/fix-tests
Reviewer Review Type Date Requested Status
Roberto Alsina (community) 2014-03-06 Approve on 2014-03-07
PS Jenkins bot continuous-integration Approve on 2014-03-06
Review via email: mp+209699@code.launchpad.net

Commit message

Use 'env' to set the environment for qml unit tests.
Add build/ directory to the ignore list.

To post a comment you must log in.
Roberto Alsina (ralsina) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '.bzrignore'
--- .bzrignore 2013-12-17 15:15:25 +0000
+++ .bzrignore 2014-03-06 14:16:25 +0000
@@ -20,4 +20,4 @@
2020
21Ubuntu21Ubuntu
22qmldir22qmldir
2323build/
2424
=== modified file 'src/tests/CMakeLists.txt'
--- src/tests/CMakeLists.txt 2014-01-10 19:14:43 +0000
+++ src/tests/CMakeLists.txt 2014-03-06 14:16:25 +0000
@@ -1,6 +1,6 @@
1set(XVFB_CMD xvfb-run -a -s "-screen 0 640x480x24")1set(XVFB_CMD xvfb-run -a -s "-screen 0 640x480x24")
2add_custom_target (qmlunit-tests2add_custom_target (qmlunit-tests
3 COMMAND QML2_IMPORT_PATH=${CMAKE_CURRENT_BINARY_DIR}/.. ${XVFB_CMD} qmltestrunner -input ${CMAKE_CURRENT_SOURCE_DIR}/qml3 COMMAND env QML2_IMPORT_PATH=${CMAKE_CURRENT_BINARY_DIR}/.. ${XVFB_CMD} qmltestrunner -input ${CMAKE_CURRENT_SOURCE_DIR}/qml
4 DEPENDS ${QML_PLUGIN_NAME}4 DEPENDS ${QML_PLUGIN_NAME}
5)5)
66

Subscribers

People subscribed via source and target branches

to all changes: