git.iko.soy/unity8
on xenial help sign in
When running qmluitests, make sure that they use LANGUAGE=C, fixing a test failure when running locally in the US.

When running "LANGUAGE=en_US.UTF-8 make -C builddir testPreviewPayments", it will fail with: FAIL! : qmltestrunner::PreviewPaymentsTest::test_purchase_text_display() Compared values are not the same Actual (): USD0.99 Expected (): 0.99USD Enforcing LANGUAGE=C solves that problem (and maybe others in the future). Approved by: Albert Astals Cid

commit79684a385293c817f8ddfbbed99a0a92ab0e703f authorMichael Terry <michael.terry@canonical.com> dateThu 18 Sep 2014, 21:25 (12 years ago) parent346d51d65245b6
2 files changed+15−4
compare with xenial
unifiedsplit
cmake/modules/QmlTest.cmake+15−3 tests/plugins/Utils/CMakeLists.txt−1
cmake/modules/QmlTest.cmake+15−3
@@ -27,11 +27,14 @@ endif()
2727
2828set(qmlscene_exe ${CMAKE_BINARY_DIR}/tests/uqmlscene/uqmlscene)
2929
30+set(test_env UNITY_TESTING=1)
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)
3335
3436 cmake_parse_arguments(qmltest "${options}" "" "${multi_value_keywords}" ${ARGN})
37+ cmake_parse_arguments(qmltest_default "${options}" "" "${multi_value_keywords}" ${qmltest_DEFAULT_PROPERTIES})
3538
3639 set(qmlscene_TARGET try${COMPONENT_NAME})
3740 set(qmltest_FILE ${SUBPATH}/tst_${COMPONENT_NAME})
@@ -49,8 +52,12 @@ macro(add_manual_qml_test SUBPATH COMPONENT_NAME)
4952 endforeach(IMPORT_PATH)
5053 endif()
5154
55+ if("${qmltest_ENVIRONMENT}" STREQUAL "")
56+ set(qmltest_ENVIRONMENT "${qmltest_default_ENVIRONMENT}")
57+ endif()
58+
5259 set(qmlscene_command
53− env ${qmltest_ENVIRONMENT}
60+ env ${test_env} ${qmltest_ENVIRONMENT}
5461 ${qmlscene_exe} -qmljsdebugger=port:3768 ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
5562 ${qmlscene_imports}
5663 )
@@ -71,6 +78,7 @@ macro(add_qml_test_internal SUBPATH COMPONENT_NAME ITERATIONS)
7178 set(multi_value_keywords IMPORT_PATHS TARGETS PROPERTIES ENVIRONMENT)
7279
7380 cmake_parse_arguments(qmltest "${options}" "" "${multi_value_keywords}" ${ARGN})
81+ cmake_parse_arguments(qmltest_default "${options}" "" "${multi_value_keywords}" ${qmltest_DEFAULT_PROPERTIES})
7482
7583 set(qmltest_TARGET test${COMPONENT_NAME})
7684 set(qmltest_xvfb_TARGET xvfbtest${COMPONENT_NAME})
@@ -102,8 +110,12 @@ macro(add_qml_test_internal SUBPATH COMPONENT_NAME ITERATIONS)
102110 set(ITERATIONS_STRING "")
103111 endif()
104112
113+ if("${qmltest_ENVIRONMENT}" STREQUAL "")
114+ set(qmltest_ENVIRONMENT "${qmltest_default_ENVIRONMENT}")
115+ endif()
116+
105117 set(qmltest_command
106− env ${qmltest_ENVIRONMENT} UNITY_TESTING=1
118+ env ${test_env} ${qmltest_ENVIRONMENT}
107119 ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
108120 ${qmltestrunner_imports}
109121 ${ITERATIONS_STRING}
@@ -117,7 +129,7 @@ macro(add_qml_test_internal SUBPATH COMPONENT_NAME ITERATIONS)
117129 set(LD_PRELOAD_PATH "LD_PRELOAD=/usr/lib/${ARCH_TRIPLET}/mesa/libGL.so.1")
118130 endif()
119131 set(qmltest_xvfb_command
120− env ${qmltest_ENVIRONMENT} ${LD_PRELOAD_PATH} UNITY_TESTING=1
132+ env ${test_env} ${qmltest_ENVIRONMENT} ${LD_PRELOAD_PATH}
121133 xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum
122134 ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
123135 ${qmltestrunner_imports}
tests/plugins/Utils/CMakeLists.txt−1
@@ -11,7 +11,6 @@ macro(run_tests)
1111 -o ${CMAKE_BINARY_DIR}/${_test}.xml,xunitxml
1212 -o -,txt)
1313 add_test(NAME ${_test} COMMAND ${testCommand})
14− set_tests_properties(${_test} PROPERTIES ENVIRONMENT "LC_ALL=C")
1514 add_custom_target(${_test} env "LC_ALL=C" ${testCommand})
1615 add_executable(${_test}Exec ${_test}.cpp modeltest.cpp)
1716 qt5_use_modules(${_test}Exec Test Core Qml)