solenv/gbuild/UITest.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d5a1378d5d78d7bc88ad8754de9dbc174b636944
Author:     Rene Engelhard <r...@debian.org>
AuthorDate: Fri Apr 3 13:45:49 2020 +0200
Commit:     Rene Engelhard <r...@debian.org>
CommitDate: Fri Apr 3 14:34:05 2020 +0200

    tdf#131835: don't set PYTHONWARNINGS=error if --enable-werror isn't set
    
    python 3.8 at least throws DeprecationWarnings for imp->importlib and some
    FutureWarnings.
    Allow to disable as for the build warnings-are-errors.
    
    Change-Id: Id5ada39f960f014108f2584e3e333741f6345acd
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91623
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
    Reviewed-by: Rene Engelhard <r...@debian.org>
    Tested-by: Jenkins
    Tested-by: Rene Engelhard <r...@debian.org>

diff --git a/solenv/gbuild/UITest.mk b/solenv/gbuild/UITest.mk
index e428dbd03c48..5b5c6d47298e 100644
--- a/solenv/gbuild/UITest.mk
+++ b/solenv/gbuild/UITest.mk
@@ -73,7 +73,7 @@ else
                PYTHONPATH="$(PYPATH)" \
                TestUserDir="$(call gb_Helper_make_url,$(dir $(call 
gb_UITest_get_target,$*)))" \
                PYTHONDONTWRITEBYTECODE=0 \
-               PYTHONWARNINGS=error \
+               $(if $(ENABLE_WERROR),PYTHONWARNINGS=error) \
                $(gb_TEST_ENV_VARS) \
                $(gb_UITest_COMMAND) \
                --soffice="$(gb_UITest_SOFFICEARG)" \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to