diff options
| -rw-r--r-- | mesonbuild/mintro.py | 5 | ||||
| -rwxr-xr-x | run_unittests.py | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/mesonbuild/mintro.py b/mesonbuild/mintro.py index 6cadd1e..48ec20f 100644 --- a/mesonbuild/mintro.py +++ b/mesonbuild/mintro.py @@ -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] diff --git a/run_unittests.py b/run_unittests.py index 9ab88bc..4fcfe81 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -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) |