diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2016-10-14 00:57:36 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2016-10-14 01:07:48 +0200 |
| commit | 5cfcd6809f46e9ca3665c6f7430658e4d71af855 (patch) | |
| tree | 2086f67cee5ba1e1b9e766c01ea6270a840fa539 /solenv/qa | |
| parent | Don't hard-code Library directory because of ExtensionLibrary (diff) | |
| download | core-5cfcd6809f46e9ca3665c6f7430658e4d71af855.tar.gz core-5cfcd6809f46e9ca3665c6f7430658e4d71af855.zip | |
add gbuildtoide support for exes
Change-Id: I320ee341651dd0c92de5176c10aa5290afea1d38
Diffstat (limited to 'solenv/qa')
| -rw-r--r-- | solenv/qa/python/gbuildtoide.py | 14 | ||||
| -rw-r--r-- | solenv/qa/python/selftest/Executable_gbuildselftestexe.mk | 16 | ||||
| -rw-r--r-- | solenv/qa/python/selftest/Module_selftest.mk | 1 | ||||
| -rw-r--r-- | solenv/qa/python/selftest/selftestexeobject.cxx | 1 |
4 files changed, 31 insertions, 1 deletions
diff --git a/solenv/qa/python/gbuildtoide.py b/solenv/qa/python/gbuildtoide.py index 71c67754e6ab..78917b8b672b 100644 --- a/solenv/qa/python/gbuildtoide.py +++ b/solenv/qa/python/gbuildtoide.py @@ -34,7 +34,6 @@ class CheckGbuildToIde(unittest.TestCase): gbuildlibs = [] for jsonfilename in jsonfiles: with open(os.path.join(tempwork, 'GbuildToIde', 'Library', jsonfilename), 'r') as f: - print('loading %s' % jsonfilename) gbuildlibs.append(json.load(f)) foundlibs = set() for lib in gbuildlibs: @@ -53,6 +52,19 @@ class CheckGbuildToIde(unittest.TestCase): self.assertTrue(False) self.assertEqual(foundlibs, set(['gbuildselftest', 'gbuildselftestdep'])) self.assertEqual(len(foundlibs), 2) + jsonfiles = os.listdir(os.path.join(tempwork, 'GbuildToIde', 'Executable')) + gbuildexes = [] + for jsonfilename in jsonfiles: + with open(os.path.join(tempwork, 'GbuildToIde', 'Executable', jsonfilename), 'r') as f: + gbuildexes.append(json.load(f)) + foundexes = set() + for exe in gbuildexes: + if exe['LINKTARGET'].find('gbuildselftestexe') != -1: + foundexes.add('gbuildselftestexe') + else: + self.assertTrue(False) + self.assertEqual(foundexes, set(['gbuildselftestexe'])) + self.assertEqual(len(foundexes), 1) if __name__ == "__main__": unittest.main() diff --git a/solenv/qa/python/selftest/Executable_gbuildselftestexe.mk b/solenv/qa/python/selftest/Executable_gbuildselftestexe.mk new file mode 100644 index 000000000000..c43a77190d26 --- /dev/null +++ b/solenv/qa/python/selftest/Executable_gbuildselftestexe.mk @@ -0,0 +1,16 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Executable_Executable,gbuildselftestexe)) + +$(eval $(call gb_Executable_add_exception_objects,gbuildselftestexe,\ + solenv/qa/python/selftest/selftestexeobject \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/solenv/qa/python/selftest/Module_selftest.mk b/solenv/qa/python/selftest/Module_selftest.mk index 9e297dd17144..f4fb0304f21b 100644 --- a/solenv/qa/python/selftest/Module_selftest.mk +++ b/solenv/qa/python/selftest/Module_selftest.mk @@ -12,6 +12,7 @@ $(eval $(call gb_Module_Module,gbuildtoidetest)) $(eval $(call gb_Module_add_targets,gbuildtoidetest,\ Library_gbuildselftestdep \ Library_gbuildselftest \ + Executable_gbuildselftestexe \ )) # vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/solenv/qa/python/selftest/selftestexeobject.cxx b/solenv/qa/python/selftest/selftestexeobject.cxx new file mode 100644 index 000000000000..78f2de106c92 --- /dev/null +++ b/solenv/qa/python/selftest/selftestexeobject.cxx @@ -0,0 +1 @@ +int main(void) { return 0; } |