diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-01-16 22:42:54 +0100 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-01-16 23:42:54 +0200 |
| commit | af38722f8976d2527cade370dcd09b3b7ea62e04 (patch) | |
| tree | ec54b9bea6df431d5336b6f947bd200b08157dc0 /run_unittests.py | |
| parent | 2bb69ad50b3267bb18252cb5f87b339736658076 (diff) | |
| download | meson-af38722f8976d2527cade370dcd09b3b7ea62e04.zip meson-af38722f8976d2527cade370dcd09b3b7ea62e04.tar.gz meson-af38722f8976d2527cade370dcd09b3b7ea62e04.tar.bz2 | |
mintro: Introspection interpreter refactoring (#4733)
* Fixed spelling
* Merged the Buildoptions and Projectinfo interpreter
* Moved detect_compilers to Environment
* Added removed test case
* Split detect_compilers and moved even more code into Environment
* Moved set_default_options to coredata
* Small code simplification in mintro.run
* Move cmd_line_options back to `environment`
We don't actually wish to persist something this unstructured, so we
shouldn't make it a field on `coredata`. It would also be data
denormalization since the information we already store in coredata
depends on the CLI args.
Diffstat (limited to 'run_unittests.py')
| -rwxr-xr-x | run_unittests.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/run_unittests.py b/run_unittests.py index 79d9e28..342ad88 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -3044,21 +3044,21 @@ 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['version'], None) + self.assertEqual(res['version'], 'undefined') self.assertEqual(res['descriptive_name'], 'run command') self.assertEqual(res['subprojects'], []) 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['version'], None) + self.assertEqual(res['version'], 'undefined') self.assertEqual(res['descriptive_name'], 'options') self.assertEqual(res['subprojects'], []) 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['version'], None) + self.assertEqual(res['version'], 'undefined') self.assertEqual(res['descriptive_name'], 'suboptions') self.assertEqual(len(res['subprojects']), 1) subproject_files = set(f.replace('\\', '/') for f in res['subprojects'][0]['buildsystem_files']) |