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

[dobey]

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

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:17
http://jenkins.qa.ubuntu.com/job/ubuntu-purchase-service-ci/24/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-purchase-service-trusty-amd64-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-purchase-service-trusty-armhf-ci/24

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-purchase-service-ci/24/rebuild

review: Approve (continuous-integration)

[Roberto Alsina (ralsina)]

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2013-12-17 15:15:25 +0000
+++ .bzrignore	2014-03-06 14:16:25 +0000
@@ -20,4 +20,4 @@
 
 Ubuntu
 qmldir
-
+build/

=== 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 @@
 set(XVFB_CMD xvfb-run -a -s "-screen 0 640x480x24")
 add_custom_target (qmlunit-tests
-  COMMAND QML2_IMPORT_PATH=${CMAKE_CURRENT_BINARY_DIR}/.. ${XVFB_CMD} qmltestrunner -input ${CMAKE_CURRENT_SOURCE_DIR}/qml
+  COMMAND env QML2_IMPORT_PATH=${CMAKE_CURRENT_BINARY_DIR}/.. ${XVFB_CMD} qmltestrunner -input ${CMAKE_CURRENT_SOURCE_DIR}/qml
   DEPENDS ${QML_PLUGIN_NAME}
 )