solenv/gbuild/UITest.mk | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit ced42c1c714cdf453b0b5086cf1390497bbbcf6a
Author: Rene Engelhard <r...@debian.org>
AuthorDate: Sat Apr 11 13:42:34 2020 +0200
Commit: Rene Engelhard <r...@debian.org>
CommitDate: Fri Apr 17 14:30:07 2020 +0200
move LIBO_LANG=C setting to gb_TEST_ENV_VARS
... since it is an environment variable after all (and without it
timeout $(gb_UITest_COMMAND) doesn't work).
Change-Id: I898e4b90070f3f4883a707fc88c99e98bc039d9f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92060
Tested-by: Jenkins
Tested-by: Rene Engelhard <r...@debian.org>
Reviewed-by: Rene Engelhard <r...@debian.org>
diff --git a/solenv/gbuild/UITest.mk b/solenv/gbuild/UITest.mk
index 5b5c6d47298e..92eaaf9faefb 100644
--- a/solenv/gbuild/UITest.mk
+++ b/solenv/gbuild/UITest.mk
@@ -37,7 +37,9 @@ else
gb_UITest_SOFFICEARG:=path:$(INSTROOT)/$(LIBO_BIN_FOLDER)/soffice
endif
-gb_UITest_COMMAND = LIBO_LANG=C $(ICECREAM_RUN) $(gb_CppunitTest_RR)
$(gb_UITest_EXECUTABLE) $(SRCDIR)/uitest/test_main.py
+gb_UITest_COMMAND = $(ICECREAM_RUN) $(gb_CppunitTest_RR)
$(gb_UITest_EXECUTABLE) $(SRCDIR)/uitest/test_main.py
+
+gb_TEST_ENV_VARS += LIBO_LANG=C
.PHONY : $(call gb_UITest_get_clean_target,%)
$(call gb_UITest_get_clean_target,%) :
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
