summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-11-14 10:36:07 +0100
committerStephan Bergmann <sbergman@redhat.com>2018-11-15 16:50:30 +0100
commit755d79e05c5b10531b8d99714121aa77b4a3c454 (patch)
treefd90e1fe0b1576015281aa9d0ce596ee7e47d5c5 /solenv
parentf90fda2eeeb319d04a52482f85fb161a6e9a7fef (diff)
Use C locale in UITest
b96180cb9bbec90b0faaf61c78c71bd4f6499e40 "uitest: set en_US.UTF8 for the LibreOffice instance" had made UITest use the en_US.UTF-8 locale (passed from LIBO_LANG to LC_ALL when starting soffice in uitest/libreoffice/connection.py), for unstated reasons. The mail sub-thread starting at <https://lists.freedesktop.org/archives/libreoffice/2018-October/081318.html> "Re: master build problems with en_US.utf8 locale" now argues that support for an en_US.UTF-8 locale in the OS should not be necessary when building LO. While absence of OS-support for en_US.UTF-8 apparently doesn't break the UITests (see <https://lists.freedesktop.org/archives/libreoffice/2018-November/081375.html> "Re: master build problems with en_US.utf8 locale"), it feels better to make these tests not use the en_US.UTF-8 locale at all. At least for me, the tests ran fine when using the C locale instead. Change-Id: I23eb2ce540bb40a7b7d13c2a396e313966f03f6e Reviewed-on: https://gerrit.libreoffice.org/63360 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/UITest.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/gbuild/UITest.mk b/solenv/gbuild/UITest.mk
index a435f8465098..4affafe2eb29 100644
--- a/solenv/gbuild/UITest.mk
+++ b/solenv/gbuild/UITest.mk
@@ -37,7 +37,7 @@ else
gb_UITest_SOFFICEARG:=path:$(INSTROOT)/$(LIBO_BIN_FOLDER)/soffice
endif
-gb_UITest_COMMAND = LIBO_LANG=en_US.UTF-8 $(gb_CppunitTest_RR) $(gb_UITest_EXECUTABLE) $(SRCDIR)/uitest/test_main.py
+gb_UITest_COMMAND = LIBO_LANG=C $(gb_CppunitTest_RR) $(gb_UITest_EXECUTABLE) $(SRCDIR)/uitest/test_main.py
.PHONY : $(call gb_UITest_get_clean_target,%)
$(call gb_UITest_get_clean_target,%) :