summaryrefslogtreecommitdiff
path: root/solenv/qa
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2016-11-23 14:54:14 +0100
committerBjörn Michaelsen <bjoern.michaelsen@canonical.com>2016-11-25 02:06:16 +0000
commit65541cfaa167c9ac80af770c6034badefdc34199 (patch)
treee44d7a9b7cf9ea62b42559b7347e0bb4526d5df6 /solenv/qa
parente62fc464f21fdaace28709f316becfa0fc54c0e8 (diff)
store makefile for targets in json too
Change-Id: Iae2f497da5d0ee4f8961a5655573e45a562dd76d Reviewed-on: https://gerrit.libreoffice.org/31116 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'solenv/qa')
-rw-r--r--solenv/qa/python/gbuildtojson.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/qa/python/gbuildtojson.py b/solenv/qa/python/gbuildtojson.py
index e09139bc59a7..5eb438d782ca 100644
--- a/solenv/qa/python/gbuildtojson.py
+++ b/solenv/qa/python/gbuildtojson.py
@@ -62,7 +62,7 @@ class CheckGbuildToJson(unittest.TestCase):
gbuildlibs.append(json.load(f))
foundlibs = set()
for lib in gbuildlibs:
- self.assertEqual(set(lib.keys()), set(['ASMOBJECTS', 'CFLAGS', 'CFLAGSAPPEND', 'CXXFLAGS', 'CXXFLAGSAPPEND', 'CXXOBJECTS', 'DEFS', 'GENCOBJECTS', 'GENCXXOBJECTS', 'ILIBTARGET', 'INCLUDE', 'LINKED_LIBS', 'LINKED_STATIC_LIBS', 'LINKTARGET', 'OBJCFLAGS', 'OBJCFLAGSAPPEND', 'OBJCOBJECTS', 'OBJCXXFLAGS', 'OBJCXXFLAGSAPPEND', 'OBJCXXOBJECTS', 'YACCOBJECTS']))
+ self.assertEqual(set(lib.keys()), set(['MAKEFILE', 'ASMOBJECTS', 'CFLAGS', 'CFLAGSAPPEND', 'CXXFLAGS', 'CXXFLAGSAPPEND', 'CXXOBJECTS', 'DEFS', 'GENCOBJECTS', 'GENCXXOBJECTS', 'ILIBTARGET', 'INCLUDE', 'LINKED_LIBS', 'LINKED_STATIC_LIBS', 'LINKTARGET', 'OBJCFLAGS', 'OBJCFLAGSAPPEND', 'OBJCOBJECTS', 'OBJCXXFLAGS', 'OBJCXXFLAGSAPPEND', 'OBJCXXOBJECTS', 'YACCOBJECTS']))
if lib['LINKTARGET'].find('gbuildselftestdep') != -1:
foundlibs.add('gbuildselftestdep')
elif lib['LINKTARGET'].find('gbuildselftest') != -1: