diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-06-10 07:52:31 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-06-10 09:33:23 +0200 |
| commit | b96180cb9bbec90b0faaf61c78c71bd4f6499e40 (patch) | |
| tree | d4e388dd1dab9e14a4d27b89bbb9f7898747dff5 | |
| parent | 7071589519f3bc63d27941ea38332b4212dde101 (diff) | |
uitest: set en_US.UTF8 for the LibreOffice instance
Change-Id: If4726804c2b967582cbf1a4e816c1c7bee01aeeb
Reviewed-on: https://gerrit.libreoffice.org/38626
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
| -rw-r--r-- | solenv/gbuild/UITest.mk | 2 | ||||
| -rw-r--r-- | uitest/libreoffice/connection.py | 10 |
2 files changed, 10 insertions, 2 deletions
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): |