git.iko.soy/unity8
on xenial help sign in
And add same logic to manual qmltests
18bacd8Michael Terry
cmake/modules/QmlTest.cmake+5
compare with xenial
unifiedsplit
@@ -34,6 +34,7 @@ macro(add_manual_qml_test SUBPATH COMPONENT_NAME)
34 set(multi_value_keywords IMPORT_PATHS TARGETS PROPERTIES ENVIRONMENT)
34 set(multi_value_keywords IMPORT_PATHS TARGETS PROPERTIES ENVIRONMENT)
35
35
36 cmake_parse_arguments(qmltest "${options}" "" "${multi_value_keywords}" ${ARGN})
36 cmake_parse_arguments(qmltest "${options}" "" "${multi_value_keywords}" ${ARGN})
37+ cmake_parse_arguments(qmltest_default "${options}" "" "${multi_value_keywords}" ${qmltest_DEFAULT_PROPERTIES})
37
38
38 set(qmlscene_TARGET try${COMPONENT_NAME})
39 set(qmlscene_TARGET try${COMPONENT_NAME})
39 set(qmltest_FILE ${SUBPATH}/tst_${COMPONENT_NAME})
40 set(qmltest_FILE ${SUBPATH}/tst_${COMPONENT_NAME})
@@ -51,6 +52,10 @@ macro(add_manual_qml_test SUBPATH COMPONENT_NAME)
51 endforeach(IMPORT_PATH)
52 endforeach(IMPORT_PATH)
52 endif()
53 endif()
53
54
55+ if("${qmltest_ENVIRONMENT}" STREQUAL "")
56+ set(qmltest_ENVIRONMENT "${qmltest_default_ENVIRONMENT}")
57+ endif()
58+
54 set(qmlscene_command
59 set(qmlscene_command
55 env ${test_env} ${qmltest_ENVIRONMENT}
60 env ${test_env} ${qmltest_ENVIRONMENT}
56 ${qmlscene_exe} -qmljsdebugger=port:3768 ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
61 ${qmlscene_exe} -qmljsdebugger=port:3768 ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml