From 3d63f21b60b5687f1ebe2a685a7ad205d61d3d6f Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric.engestrom@imgtec.com>
Date: Wed, 6 Dec 2017 11:30:06 +0000
Subject: Fix `array` type name

c9351ce30c03d107279090da7825096951a705d3 introduced the type as `array`,
so mintro should expose it under the same name.

(while at it, rename test 169 to be coherent)
---
 mesonbuild/mintro.py                           | 2 +-
 run_unittests.py                               | 4 ++--
 test cases/common/169 array option/meson.build | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mesonbuild/mintro.py b/mesonbuild/mintro.py
index efa26cf..b23869f 100644
--- 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
index fed8fae..343065d 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -1588,7 +1588,7 @@ int main(int argc, char **argv) {
         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 @@ int main(int argc, char **argv) {
         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
index bfcde7c..034b9a5 100644
--- 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')
-- 
cgit v1.1