solenv/gbuild/UITest.mk | 2 +-
uitest/libreoffice/connection.py | 10 +++++++++-
2 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit b96180cb9bbec90b0faaf61c78c71bd4f6499e40
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Sat Jun 10 07:52:31 2017 +0200
uitest: set en_US.UTF8 for the LibreOffice instance
Change-Id: If4726804c2b967582cbf1a4e816c1c7bee01aeeb
Reviewed-on: https://gerrit.libreoffice.org/38626
Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
diff --git a/solenv/gbuild/UITest.mk b/solenv/gbuild/UITest.mk
index 21560c8ced18..67004b29af21 100644
--- a/solenv/gbuild/UITest.mk
+++ b/solenv/gbuild/UITest.mk
@@ -26,7 +26,7 @@ gb_UITest_GDBTRACE := --gdb
gb_UITest__interactive := $(true)
endif
-gb_UITest_COMMAND := $(gb_UITest_EXECUTABLE) $(SRCDIR)/uitest/test_main.py
+gb_UITest_COMMAND := LIBO_LANG=en_US.UTF-8 $(gb_UITest_EXECUTABLE)
$(SRCDIR)/uitest/test_main.py
.PHONY : $(call gb_UITest_get_clean_target,%)
$(call gb_UITest_get_clean_target,%) :
diff --git a/uitest/libreoffice/connection.py b/uitest/libreoffice/connection.py
index 2c385747056e..81f10ab36910 100644
--- a/uitest/libreoffice/connection.py
+++ b/uitest/libreoffice/connection.py
@@ -8,6 +8,7 @@
import subprocess
import time
import uuid
+import os
try:
import pyuno
@@ -76,7 +77,14 @@ class OfficeConnection:
argv.insert(3, "--args")
argv[4] = argv[4].replace("soffice", "soffice.bin")
- self.pro = subprocess.Popen(argv)
+ env = None
+ environ = dict(os.environ)
+ if 'LIBO_LANG' in environ:
+ env = environ
+ env['LC_ALL'] = environ['LIBO_LANG']
+ print(env)
+
+ self.pro = subprocess.Popen(argv, env=env)
return self.pro
def connect(self, socket):
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
