on xenial help sign in
And add same logic to manual qmltests
commit18bacd88d43235541060ffca2ff7efa20dda8f52 authorMichael Terry <michael.terry@canonical.com> dateWed 17 Sep 2014, 09:51 (12 years ago) parent0833bdb
1 file changed+5
cmake/modules/QmlTest.cmake+5
cmake/modules/QmlTest.cmake+5
@@ -34,6 +34,7 @@ macro(add_manual_qml_test SUBPATH COMPONENT_NAME)
3434 set(multi_value_keywords IMPORT_PATHS TARGETS PROPERTIES ENVIRONMENT)
3535
3636 cmake_parse_arguments(qmltest "${options}" "" "${multi_value_keywords}" ${ARGN})
37+ cmake_parse_arguments(qmltest_default "${options}" "" "${multi_value_keywords}" ${qmltest_DEFAULT_PROPERTIES})
3738
3839 set(qmlscene_TARGET try${COMPONENT_NAME})
3940 set(qmltest_FILE ${SUBPATH}/tst_${COMPONENT_NAME})
@@ -51,6 +52,10 @@ macro(add_manual_qml_test SUBPATH COMPONENT_NAME)
5152 endforeach(IMPORT_PATH)
5253 endif()
5354
55+ if("${qmltest_ENVIRONMENT}" STREQUAL "")
56+ set(qmltest_ENVIRONMENT "${qmltest_default_ENVIRONMENT}")
57+ endif()
58+
5459 set(qmlscene_command
5560 env ${test_env} ${qmltest_ENVIRONMENT}
5661 ${qmlscene_exe} -qmljsdebugger=port:3768 ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml