Fix array type name

c9351ce introduced the type as `array`, so mintro should expose it under the same name. (while at it, rename test 169 to be coherent)
judemille · Dec 7, 2017 · 3d63f21 · 3d63f21
1 parent 5992ab1
commit 3d63f21
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/mesonbuild/mintro.py b/mesonbuild/mintro.py
@@ -140,7 +140,7 @@ def add_keys(optlist, options):
             optdict['choices'] = opt.choices
             typestr = 'combo'
         elif isinstance(opt, coredata.UserArrayOption):
-            typestr = 'stringarray'
+            typestr = 'array'
         else:
             raise RuntimeError("Unknown option type")
         optdict['type'] = typestr

diff --git a/run_unittests.py b/run_unittests.py
@@ -1588,7 +1588,7 @@ def get_opt():
         expected = {
             'name': 'list',
             'description': 'list',
-            'type': 'stringarray',
+            'type': 'array',
             'value': ['foo', 'bar'],
         }
         tdir = os.path.join(self.unit_test_dir, '18 array option')
@@ -1612,7 +1612,7 @@ def get_opt():
         expected = {
             'name': 'list',
             'description': 'list',
-            'type': 'stringarray',
+            'type': 'array',
             'value': ['foo', 'bar'],
         }
         tdir = os.path.join(self.unit_test_dir, '18 array option')

diff --git a/test cases/common/169 array option/meson.build b/test cases/common/169 array option/meson.build
@@ -12,6 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-project('stringarray default options')
+project('array default options')
 
 assert(get_option('array') == ['foo', 'bar'], 'Default value for array is not equal to choices')