introspect: include choices for array options

There was even a test covering this, but it did not fail due to a typo.
bruce-richardson · Oct 14, 2021 · 5e96730 · 5e96730
1 parent 4f7c0d0
commit 5e96730
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/mesonbuild/mintro.py b/mesonbuild/mintro.py
@@ -287,6 +287,8 @@ def add_keys(options: 'cdata.KeyedOptionDictType', section: str) -> None:
                 typestr = 'integer'
             elif isinstance(opt, cdata.UserArrayOption):
                 typestr = 'array'
+                if opt.choices:
+                    optdict['choices'] = opt.choices
             else:
                 raise RuntimeError("Unknown option type")
             optdict['type'] = typestr

diff --git a/unittests/allplatformstests.py b/unittests/allplatformstests.py
@@ -1595,6 +1595,7 @@ def get_opt():
             'section': 'user',
             'type': 'array',
             'value': ['foo', 'bar'],
+            'choices': ['foo', 'bar', 'oink', 'boink'],
             'machine': 'any',
         }
         tdir = os.path.join(self.unit_test_dir, '19 array option')
@@ -1621,6 +1622,7 @@ def get_opt():
             'section': 'user',
             'type': 'array',
             'value': ['foo', 'bar'],
+            'choices': ['foo', 'bar', 'oink', 'boink'],
             'machine': 'any',
         }
         tdir = os.path.join(self.unit_test_dir, '19 array option')
@@ -1647,6 +1649,7 @@ def get_opt():
             'section': 'user',
             'type': 'array',
             'value': [],
+            'choices': ['foo', 'bar', 'oink', 'boink'],
             'machine': 'any',
         }
         tdir = os.path.join(self.unit_test_dir, '19 array option')
@@ -1703,7 +1706,7 @@ def test_options_with_choices_changing(self) -> None:
             if item['name'] == 'combo':
                 self.assertEqual(item['value'], 'b')
                 self.assertEqual(item['choices'], ['b', 'c', 'd'])
-            elif item['name'] == 'arr':
+            elif item['name'] == 'array':
                 self.assertEqual(item['value'], ['b'])
                 self.assertEqual(item['choices'], ['b', 'c', 'd'])
 
@@ -1721,7 +1724,7 @@ def test_options_with_choices_changing(self) -> None:
             if item['name'] == 'combo':
                 self.assertEqual(item['value'], 'c')
                 self.assertEqual(item['choices'], ['b', 'c', 'd'])
-            elif item['name'] == 'arr':
+            elif item['name'] == 'array':
                 self.assertEqual(item['value'], ['b', 'c'])
                 self.assertEqual(item['choices'], ['b', 'c', 'd'])