Merge ~santoshbit2007/oxide:ubuntu_testcases_with_uitk_flag into oxide:master

Proposed by Santosh on 2017-01-25
Status: Merged
Approved by: Chris Coulson on 2017-01-25
Approved revision: 3731c5dda4e778f16b5088397e00f0c04c6432a3
Merge reported by: Santosh
Merged at revision: not available
Proposed branch: ~santoshbit2007/oxide:ubuntu_testcases_with_uitk_flag
Merge into: oxide:master
Diff against target: 35 lines (+12/-8)
1 file modified
qt/tests/qmltests/CMakeLists.txt (+12/-8)
Reviewer Review Type Date Requested Status
Chris Coulson 2017-01-25 Approve on 2017-01-25
Review via email: mp+315554@code.launchpad.net

Description of the change

Add ubuntu_api and ubuntu_ui test target only when ENABLE_UITK_WEBVIEW is enabled

To post a comment you must log in.
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/qt/tests/qmltests/CMakeLists.txt b/qt/tests/qmltests/CMakeLists.txt
2index 02ffe0a..cd32938 100644
3--- a/qt/tests/qmltests/CMakeLists.txt
4+++ b/qt/tests/qmltests/CMakeLists.txt
5@@ -149,10 +149,12 @@ add_qml_test(EXEC qmltest_web_platform_screen
6 MOCK_QPA)
7 add_qml_test(EXEC qmltest_crash NAME qml-crash-test
8 TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}/crash)
9-add_qml_test(EXEC qmltest_ubuntu_api NAME qml-ubuntu-api-test
10- TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ubuntu_api)
11-add_qml_test(EXEC qmltest_ubuntu_ui NAME qml-ubuntu-ui-test
12- TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ubuntu_ui)
13+if(ENABLE_UITK_WEBVIEW)
14+ add_qml_test(EXEC qmltest_ubuntu_api NAME qml-ubuntu-api-test
15+ TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ubuntu_api)
16+ add_qml_test(EXEC qmltest_ubuntu_ui NAME qml-ubuntu-ui-test
17+ TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ubuntu_ui)
18+endif()
19 add_qml_test(EXEC qmltest_api NAME qml-api-single-process-test
20 TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}/api
21 SINGLE_PROCESS
22@@ -169,7 +171,9 @@ add_qml_test(EXEC qmltest_web_platform_screen
23 MOCK_QPA SINGLE_PROCESS)
24 add_qml_test(EXEC qmltest_crash NAME qml-crash-single-process-test
25 TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}/crash SINGLE_PROCESS)
26-add_qml_test(EXEC qmltest_ubuntu_api NAME qml-ubuntu-api-single-process-test
27- TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ubuntu_api SINGLE_PROCESS)
28-add_qml_test(EXEC qmltest_ubuntu_ui NAME qml-ubuntu-ui-single-process-test
29- TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ubuntu_ui SINGLE_PROCESS)
30+if(ENABLE_UITK_WEBVIEW)
31+ add_qml_test(EXEC qmltest_ubuntu_api NAME qml-ubuntu-api-single-process-test
32+ TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ubuntu_api SINGLE_PROCESS)
33+ add_qml_test(EXEC qmltest_ubuntu_ui NAME qml-ubuntu-ui-single-process-test
34+ TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ubuntu_ui SINGLE_PROCESS)
35+endif()

Subscribers

People subscribed via source and target branches

to all changes: