solenv/qa/python/gbuildtojson.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4e9aa386556f49358a1cef5c5f6b9b26d2e9e1b8
Author: Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Mon Mar 2 10:29:04 2020 +0100
Commit: Luboš Luňák <l.lu...@collabora.com>
CommitDate: Mon Mar 2 12:12:46 2020 +0100
prevent gbuildtojson.py from removing the GBUILD_TRACE file
It starts a new make (MAKE_RESTARTS is again not set), so the code
for removing the file gets triggered again.
Change-Id: If48214703fd86337a5bfa2c1c8e67cbdfbdfdfad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89814
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lu...@collabora.com>
diff --git a/solenv/qa/python/gbuildtojson.py b/solenv/qa/python/gbuildtojson.py
index a9888690af77..ccb7893ccb0f 100644
--- a/solenv/qa/python/gbuildtojson.py
+++ b/solenv/qa/python/gbuildtojson.py
@@ -25,7 +25,7 @@ def getgbuildtesttools(testcase):
testcase.bash = gbuildtesttools['BASH']
testcase.gbuildtojson = gbuildtesttools['GBUILDTOJSON']
-makeenvvars = ['MAKEOVERRIDES', 'MAKEFLAGS', 'MAKE_TERMERR', 'MAKE_TERMOUT',
'MAKELEVEL', 'MFLAGS']
+makeenvvars = ['MAKEOVERRIDES', 'MAKEFLAGS', 'MAKE_TERMERR', 'MAKE_TERMOUT',
'MAKELEVEL', 'MFLAGS', 'GBUILD_TRACE']
def clearmakevars():
if 'LD_LIBRARY_PATH' in os.environ:
os.environ['GBUILDTOJSON_LD_LIBRARY_PATH'] =
os.environ['LD_LIBRARY_PATH']
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
