Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove name property from introspect --projectinfo as it is not used

This commit is contained in:
Daniel Schulte 2018-11-21 21:23:12 +01:00
parent 0e62193730
commit f954eee906
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mesonbuild/mintro.py
View File

@ -226,8 +226,7 @@ def list_tests(testdata):
print(json.dumps(result))
def list_projinfo(builddata):
result = {'name': builddata.project_name,
'version': builddata.project_version,
result = {'version': builddata.project_version,
'descriptive_name': builddata.project_name}
subprojects = []
for k, v in builddata.subprojects.items():
@ -276,7 +275,7 @@ def list_projinfo_from_source(sourcedir):
version = None
if interpreter.project_version is str:
version = interpreter.project_version
result.update({'name': interpreter.project_name, 'version': version, 'descriptive_name': interpreter.project_name})
result.update({'version': version, 'descriptive_name': interpreter.project_name})
result['buildsystem_files'].append(f)
elif f.startswith('subprojects/'):
subproject_id = f.split('/')[1]

3
run_unittests.py
View File

@ -2924,7 +2924,6 @@ recommended as it is not supported on some platforms''')
testfile = os.path.join(self.common_test_dir, '36 run program', 'meson.build')
res = self.introspect_directory(testfile, '--projectinfo')
self.assertEqual(set(res['buildsystem_files']), set(['meson.build']))
self.assertEqual(res['name'], 'run command')
self.assertEqual(res['version'], None)
self.assertEqual(res['descriptive_name'], 'run command')
self.assertEqual(res['subprojects'], [])
@ -2932,7 +2931,6 @@ recommended as it is not supported on some platforms''')
testfile = os.path.join(self.common_test_dir, '44 options', 'meson.build')
res = self.introspect_directory(testfile, '--projectinfo')
self.assertEqual(set(res['buildsystem_files']), set(['meson_options.txt', 'meson.build']))
self.assertEqual(res['name'], 'options')
self.assertEqual(res['version'], None)
self.assertEqual(res['descriptive_name'], 'options')
self.assertEqual(res['subprojects'], [])
@ -2940,7 +2938,6 @@ recommended as it is not supported on some platforms''')
testfile = os.path.join(self.common_test_dir, '47 subproject options', 'meson.build')
res = self.introspect_directory(testfile, '--projectinfo')
self.assertEqual(set(res['buildsystem_files']), set(['meson_options.txt', 'meson.build']))
self.assertEqual(res['name'], 'suboptions')
self.assertEqual(res['version'], None)
self.assertEqual(res['descriptive_name'], 'suboptions')
self.assertEqual(len(res['subprojects']), 1)