on xenial help sign in
Fix running payment preview test in US locale
commit250fae56efa0b9ff4902b92a96a99b35bf3ce90f authorMichael Terry <michael.terry@canonical.com> dateMon 15 Sep 2014, 16:58 (12 years ago) parentbd05eec
1 file changed+5−3
cmake/modules/QmlTest.cmake+5−3
cmake/modules/QmlTest.cmake+5−3
@@ -27,6 +27,8 @@ endif()
2727
2828set(qmlscene_exe ${CMAKE_BINARY_DIR}/tests/uqmlscene/uqmlscene)
2929
30+set(test_env UNITY_TESTING=1 LANGUAGE=C)
31+
3032macro(add_manual_qml_test SUBPATH COMPONENT_NAME)
3133 set(options NO_ADD_TEST NO_TARGETS)
3234 set(multi_value_keywords IMPORT_PATHS TARGETS PROPERTIES ENVIRONMENT)
@@ -50,7 +52,7 @@ macro(add_manual_qml_test SUBPATH COMPONENT_NAME)
5052 endif()
5153
5254 set(qmlscene_command
53− env ${qmltest_ENVIRONMENT}
55+ env ${qmltest_ENVIRONMENT} ${test_env}
5456 ${qmlscene_exe} -qmljsdebugger=port:3768 ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
5557 ${qmlscene_imports}
5658 )
@@ -103,7 +105,7 @@ macro(add_qml_test_internal SUBPATH COMPONENT_NAME ITERATIONS)
103105 endif()
104106
105107 set(qmltest_command
106− env ${qmltest_ENVIRONMENT} UNITY_TESTING=1
108+ env ${qmltest_ENVIRONMENT} ${test_env}
107109 ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
108110 ${qmltestrunner_imports}
109111 ${ITERATIONS_STRING}
@@ -117,7 +119,7 @@ macro(add_qml_test_internal SUBPATH COMPONENT_NAME ITERATIONS)
117119 set(LD_PRELOAD_PATH "LD_PRELOAD=/usr/lib/${ARCH_TRIPLET}/mesa/libGL.so.1")
118120 endif()
119121 set(qmltest_xvfb_command
120− env ${qmltest_ENVIRONMENT} ${LD_PRELOAD_PATH} UNITY_TESTING=1
122+ env ${qmltest_ENVIRONMENT} ${LD_PRELOAD_PATH} ${test_env}
121123 xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum
122124 ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
123125 ${qmltestrunner_imports}