Fix `array` type name

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

(while at it, rename test 169 to be coherent)
pull/2749/head
Eric Engestrom 7 years ago committed by Jussi Pakkanen
parent 5992ab1c72
commit 3d63f21b60
  1. 2
      mesonbuild/mintro.py
  2. 4
      run_unittests.py
  3. 2
      test cases/common/169 array option/meson.build

@ -140,7 +140,7 @@ def add_keys(optlist, options):
optdict['choices'] = opt.choices optdict['choices'] = opt.choices
typestr = 'combo' typestr = 'combo'
elif isinstance(opt, coredata.UserArrayOption): elif isinstance(opt, coredata.UserArrayOption):
typestr = 'stringarray' typestr = 'array'
else: else:
raise RuntimeError("Unknown option type") raise RuntimeError("Unknown option type")
optdict['type'] = typestr optdict['type'] = typestr

@ -1588,7 +1588,7 @@ int main(int argc, char **argv) {
expected = { expected = {
'name': 'list', 'name': 'list',
'description': 'list', 'description': 'list',
'type': 'stringarray', 'type': 'array',
'value': ['foo', 'bar'], 'value': ['foo', 'bar'],
} }
tdir = os.path.join(self.unit_test_dir, '18 array option') tdir = os.path.join(self.unit_test_dir, '18 array option')
@ -1612,7 +1612,7 @@ int main(int argc, char **argv) {
expected = { expected = {
'name': 'list', 'name': 'list',
'description': 'list', 'description': 'list',
'type': 'stringarray', 'type': 'array',
'value': ['foo', 'bar'], 'value': ['foo', 'bar'],
} }
tdir = os.path.join(self.unit_test_dir, '18 array option') tdir = os.path.join(self.unit_test_dir, '18 array option')

@ -12,6 +12,6 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # 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') assert(get_option('array') == ['foo', 'bar'], 'Default value for array is not equal to choices')

Loading…
Cancel
Save