options: commonize code to accept unknown options

The check for unknown options is duplicated in OptionStore and MesonApp.  Place the
better version of the two as a new method of OptionStore, and use it in
OptionStore.validate_cmd_line_options.

Signed-off-by: Paolo Bonzini <[email protected]>
(cherry picked from commit cc382b2)

# Conflicts:
#       mesonbuild/options.py

Author: bonzini

mesonbuild/msetup.py

@@ -11,7 +11,7 @@
 
 from . import build, coredata, environment, interpreter, mesonlib, mintro, mlog
 from .mesonlib import MesonException
-from .options import COMPILER_BASE_OPTIONS, OptionKey
+from .options import OptionKey
 
 if T.TYPE_CHECKING:
     from typing_extensions import Protocol
@@ -191,18 +191,14 @@ def generate(self, capture: bool = False, vslite_ctx: T.Optional[dict] = None) -
         with mesonlib.BuildDirLock(self.build_dir):
             return self._generate(env, capture, vslite_ctx)
 
-    def check_unused_options(self, coredata: 'coredata.CoreData', cmd_line_options: T.Any, all_subprojects: T.Any) -> None:
+    def check_unused_options(self, coredata: 'coredata.CoreData', cmd_line_options: T.Any, all_subprojects: T.Mapping[str, object]) -> None:
         pending = coredata.optstore.pending_options
         errlist: T.List[str] = []
+        known_subprojects = all_subprojects.keys()
         for opt in pending:
-            # It is not an error to set wrong option for unknown subprojects or
-            # language because we don't have control on which one will be selected.
-            if opt.subproject and opt.subproject not in all_subprojects:
-                continue
-            if coredata.optstore.is_compiler_option(opt):
-                continue
-            if (coredata.optstore.is_base_option(opt) and
-                    opt.evolve(subproject=None, machine=mesonlib.MachineChoice.HOST) in COMPILER_BASE_OPTIONS):
+            # It is not an error to set wrong option for unknown subprojects
+            # because they might be used in future reconfigurations
+            if coredata.optstore.accept_as_pending_option(opt, known_subprojects):
                 continue
             keystr = str(opt)
             if keystr in cmd_line_options:

mesonbuild/options.py

@@ -1382,20 +1382,29 @@ def initialize_from_top_level_project_call(self,
                 else:
                     self.pending_options[key] = valstr
 
+    def accept_as_pending_option(self, key: OptionKey, known_subprojects: T.Optional[T.Union[T.Set[str], T.KeysView[str]]] = None) -> bool:
+        # Fail on unknown options that we can know must exist at this point in time.
+        # Subproject and compiler options are resolved later.
+        #
+        # Some base options (sanitizers etc) might get added later.
+        # Permitting them all is not strictly correct.
+        if key.subproject:
+            if known_subprojects is None or key.subproject not in known_subprojects:
+                return True
+        if self.is_compiler_option(key):
+            return True
+        return (self.is_base_option(key) and
+                key.evolve(subproject=None, machine=MachineChoice.HOST) in COMPILER_BASE_OPTIONS)
+
     def validate_cmd_line_options(self, cmd_line_options: OptionStringLikeDict) -> None:
         unknown_options = []
         for keystr, valstr in cmd_line_options.items():
             if isinstance(keystr, str):
                 key = OptionKey.from_string(keystr)
             else:
                 key = keystr
-            # Fail on unknown options that we can know must exist at this point in time.
-            # Subproject and compiler options are resolved later.
-            #
-            # Some base options (sanitizers etc) might get added later.
-            # Permitting them all is not strictly correct.
-            if key.subproject is None and not self.is_compiler_option(key) and not self.is_base_option(key) and \
-               key in self.pending_options:
+
+            if key in self.pending_options and not self.accept_as_pending_option(key):
                 unknown_options.append(f'"{key}"')
 
         if unknown_options:

unittests/optiontests.py

@@ -203,6 +203,17 @@ def test_b_default(self):
         value = optstore.get_default_for_b_option(OptionKey('b_vscrt'))
         self.assertEqual(value, 'from_buildtype')
 
+    def test_b_nonexistent(self):
+        optstore = OptionStore(False)
+        assert optstore.accept_as_pending_option(OptionKey('b_ndebug'))
+        assert not optstore.accept_as_pending_option(OptionKey('b_whatever'))
+
+    def test_subproject_nonexistent(self):
+        optstore = OptionStore(False)
+        subprojects = {'found'}
+        assert not optstore.accept_as_pending_option(OptionKey('foo', subproject='found'), subprojects)
+        assert optstore.accept_as_pending_option(OptionKey('foo', subproject='whatisthis'), subprojects)
+
     def test_deprecated_nonstring_value(self):
         # TODO: add a lot more deprecated option tests
         optstore = OptionStore(False)