summaryrefslogtreecommitdiff
path: root/solenv/gbuild
diff options
context:
space:
mode:
authorRene Engelhard <rene@debian.org>2020-04-03 13:45:49 +0200
committerRene Engelhard <rene@debian.org>2020-04-03 14:34:05 +0200
commitd5a1378d5d78d7bc88ad8754de9dbc174b636944 (patch)
tree04c2df806235efa58847d987a5e438e9579520e0 /solenv/gbuild
parentf79a67a3d09db860b7bb783cdf9e28a5dcd39ea4 (diff)
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.grandin@collabora.co.uk> Reviewed-by: Rene Engelhard <rene@debian.org> Tested-by: Jenkins Tested-by: Rene Engelhard <rene@debian.org>
Diffstat (limited to 'solenv/gbuild')
-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 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)" \