git.iko.soy/unity8
on xenial help sign in
Properly parse default environment for qmluitests
0833bdbMichael Terry
cmake/modules/QmlTest.cmake+9−4
compare with xenial
unifiedsplit
@@ -27,7 +27,7 @@ endif()
27
27
28set(qmlscene_exe ${CMAKE_BINARY_DIR}/tests/uqmlscene/uqmlscene)
28set(qmlscene_exe ${CMAKE_BINARY_DIR}/tests/uqmlscene/uqmlscene)
29
29
30−set(test_env UNITY_TESTING=1 LANGUAGE=C)
30+set(test_env UNITY_TESTING=1)
31
31
32macro(add_manual_qml_test SUBPATH COMPONENT_NAME)
32macro(add_manual_qml_test SUBPATH COMPONENT_NAME)
33 set(options NO_ADD_TEST NO_TARGETS)
33 set(options NO_ADD_TEST NO_TARGETS)
@@ -52,7 +52,7 @@ macro(add_manual_qml_test SUBPATH COMPONENT_NAME)
52 endif()
52 endif()
53
53
54 set(qmlscene_command
54 set(qmlscene_command
55− env ${qmltest_ENVIRONMENT} ${test_env}
55+ env ${test_env} ${qmltest_ENVIRONMENT}
56 ${qmlscene_exe} -qmljsdebugger=port:3768 ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
56 ${qmlscene_exe} -qmljsdebugger=port:3768 ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
57 ${qmlscene_imports}
57 ${qmlscene_imports}
58 )
58 )
@@ -73,6 +73,7 @@ macro(add_qml_test_internal SUBPATH COMPONENT_NAME ITERATIONS)
73 set(multi_value_keywords IMPORT_PATHS TARGETS PROPERTIES ENVIRONMENT)
73 set(multi_value_keywords IMPORT_PATHS TARGETS PROPERTIES ENVIRONMENT)
74
74
75 cmake_parse_arguments(qmltest "${options}" "" "${multi_value_keywords}" ${ARGN})
75 cmake_parse_arguments(qmltest "${options}" "" "${multi_value_keywords}" ${ARGN})
76+ cmake_parse_arguments(qmltest_default "${options}" "" "${multi_value_keywords}" ${qmltest_DEFAULT_PROPERTIES})
76
77
77 set(qmltest_TARGET test${COMPONENT_NAME})
78 set(qmltest_TARGET test${COMPONENT_NAME})
78 set(qmltest_xvfb_TARGET xvfbtest${COMPONENT_NAME})
79 set(qmltest_xvfb_TARGET xvfbtest${COMPONENT_NAME})
@@ -104,8 +105,12 @@ macro(add_qml_test_internal SUBPATH COMPONENT_NAME ITERATIONS)
104 set(ITERATIONS_STRING "")
105 set(ITERATIONS_STRING "")
105 endif()
106 endif()
106
107
108+ if("${qmltest_ENVIRONMENT}" STREQUAL "")
109+ set(qmltest_ENVIRONMENT "${qmltest_default_ENVIRONMENT}")
110+ endif()
111+
107 set(qmltest_command
112 set(qmltest_command
108− env ${qmltest_ENVIRONMENT} ${test_env}
113+ env ${test_env} ${qmltest_ENVIRONMENT}
109 ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
114 ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
110 ${qmltestrunner_imports}
115 ${qmltestrunner_imports}
111 ${ITERATIONS_STRING}
116 ${ITERATIONS_STRING}
@@ -119,7 +124,7 @@ macro(add_qml_test_internal SUBPATH COMPONENT_NAME ITERATIONS)
119 set(LD_PRELOAD_PATH "LD_PRELOAD=/usr/lib/${ARCH_TRIPLET}/mesa/libGL.so.1")
124 set(LD_PRELOAD_PATH "LD_PRELOAD=/usr/lib/${ARCH_TRIPLET}/mesa/libGL.so.1")
120 endif()
125 endif()
121 set(qmltest_xvfb_command
126 set(qmltest_xvfb_command
122− env ${qmltest_ENVIRONMENT} ${LD_PRELOAD_PATH} ${test_env}
127+ env ${test_env} ${qmltest_ENVIRONMENT} ${LD_PRELOAD_PATH}
123 xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum
128 xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum
124 ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
129 ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
125 ${qmltestrunner_imports}
130 ${qmltestrunner_imports}