diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2016-11-23 14:54:14 +0100 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2016-11-25 02:06:16 +0000 |
| commit | 65541cfaa167c9ac80af770c6034badefdc34199 (patch) | |
| tree | e44d7a9b7cf9ea62b42559b7347e0bb4526d5df6 /solenv/qa | |
| parent | use gbuild prefix for tempdirs (diff) | |
| download | core-65541cfaa167c9ac80af770c6034badefdc34199.tar.gz core-65541cfaa167c9ac80af770c6034badefdc34199.zip | |
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.py | 2 |
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: |