diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2025-02-21 12:45:50 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2025-02-22 01:54:02 +0200 |
| commit | 4386e2afe17f8a399d7c202476261c760cdce1e3 (patch) | |
| tree | 62f6c13ccd8c17f169640325792ce4d6966cc6f9 | |
| parent | d995cbce0f1e9454fdfe467e47c2423aa5217fd3 (diff) | |
| download | meson-4386e2afe17f8a399d7c202476261c760cdce1e3.tar.gz | |
Permit all unknown b_ options.
Closes #14254.
| -rw-r--r-- | mesonbuild/msetup.py | 7 | ||||
| -rw-r--r-- | unittests/platformagnostictests.py | 9 |
2 files changed, 10 insertions, 6 deletions
diff --git a/mesonbuild/msetup.py b/mesonbuild/msetup.py index ac0ea7f06..6753b0255 100644 --- a/mesonbuild/msetup.py +++ b/mesonbuild/msetup.py @@ -191,7 +191,6 @@ class MesonApp: def check_unused_options(self, coredata: 'coredata.CoreData', cmd_line_options: T.Any, all_subprojects: T.Any) -> None: pending = coredata.optstore.pending_project_options errlist: T.List[str] = [] - permitted_unknowns = ['b_vscrt', 'b_lto', 'b_lundef', 'b_ndebug'] permitlist: T.List[str] = [] for opt in pending: # Due to backwards compatibility setting build options in non-cross @@ -204,8 +203,10 @@ class MesonApp: if opt.subproject and opt.subproject not in all_subprojects: continue if coredata.optstore.is_compiler_option(opt): + permitlist.append(opt.name) continue - if opt.name in permitted_unknowns: + # Ditto for base options. + if coredata.optstore.is_base_option(opt): permitlist.append(opt.name) continue keystr = str(opt) @@ -222,7 +223,7 @@ class MesonApp: # support it, this option gets silently swallowed. # So at least print a message about it. optstr = ','.join(permitlist) - mlog.warning(f'Some command line options went unused: {optstr}', fatal=False) + mlog.warning(f'The following command line option(s) were not used: {optstr}', fatal=False) coredata.optstore.clear_pending() diff --git a/unittests/platformagnostictests.py b/unittests/platformagnostictests.py index f787805a5..990936e85 100644 --- a/unittests/platformagnostictests.py +++ b/unittests/platformagnostictests.py @@ -415,9 +415,12 @@ class PlatformAgnosticTests(BasePlatformTests): def test_setup_with_unknown_option(self): testdir = os.path.join(self.common_test_dir, '1 trivial') - for option in ('not_an_option', 'b_not_an_option'): - out = self.init(testdir, extra_args=['--wipe', f'-D{option}=1'], allow_fail=True) - self.assertIn(f'ERROR: Unknown options: "{option}"', out) + out = self.init(testdir, extra_args=['--wipe', '-Dnot_an_option=1'], allow_fail=True) + self.assertIn('ERROR: Unknown options: "not_an_option"', out) + + out = self.init(testdir, extra_args=['--wipe', '-Db_not_an_option=1']) + self.assertIn('WARNING: The following command line option(s) were not used: b_not_an_option', out) + def test_configure_new_option(self) -> None: """Adding a new option without reconfiguring should work.""" |