git.iko.soy/unity8
on xenial help sign in
Fix running payment preview test in US locale
250fae5Michael Terry
cmake/modules/QmlTest.cmake+5−3
compare with xenial
unifiedsplit
@@ -27,6 +27,8 @@ 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)
31+
30macro(add_manual_qml_test SUBPATH COMPONENT_NAME)
32macro(add_manual_qml_test SUBPATH COMPONENT_NAME)
31 set(options NO_ADD_TEST NO_TARGETS)
33 set(options NO_ADD_TEST NO_TARGETS)
32 set(multi_value_keywords IMPORT_PATHS TARGETS PROPERTIES ENVIRONMENT)
34 set(multi_value_keywords IMPORT_PATHS TARGETS PROPERTIES ENVIRONMENT)
@@ -50,7 +52,7 @@ macro(add_manual_qml_test SUBPATH COMPONENT_NAME)
50 endif()
52 endif()
51
53
52 set(qmlscene_command
54 set(qmlscene_command
53− env ${qmltest_ENVIRONMENT}
55+ env ${qmltest_ENVIRONMENT} ${test_env}
54 ${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
55 ${qmlscene_imports}
57 ${qmlscene_imports}
56 )
58 )
@@ -103,7 +105,7 @@ macro(add_qml_test_internal SUBPATH COMPONENT_NAME ITERATIONS)
103 endif()
105 endif()
104
106
105 set(qmltest_command
107 set(qmltest_command
106− env ${qmltest_ENVIRONMENT} UNITY_TESTING=1
108+ env ${qmltest_ENVIRONMENT} ${test_env}
107 ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
109 ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
108 ${qmltestrunner_imports}
110 ${qmltestrunner_imports}
109 ${ITERATIONS_STRING}
111 ${ITERATIONS_STRING}
@@ -117,7 +119,7 @@ macro(add_qml_test_internal SUBPATH COMPONENT_NAME ITERATIONS)
117 set(LD_PRELOAD_PATH "LD_PRELOAD=/usr/lib/${ARCH_TRIPLET}/mesa/libGL.so.1")
119 set(LD_PRELOAD_PATH "LD_PRELOAD=/usr/lib/${ARCH_TRIPLET}/mesa/libGL.so.1")
118 endif()
120 endif()
119 set(qmltest_xvfb_command
121 set(qmltest_xvfb_command
120− env ${qmltest_ENVIRONMENT} ${LD_PRELOAD_PATH} UNITY_TESTING=1
122+ env ${qmltest_ENVIRONMENT} ${LD_PRELOAD_PATH} ${test_env}
121 xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum
123 xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum
122 ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
124 ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
123 ${qmltestrunner_imports}
125 ${qmltestrunner_imports}