Correctly handle the --arch argument to dart test scripts.

tools/testing/dart/test_options.dart

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #library("test_options_parser");
 
 List<String> defaultTestSelectors =
     const ['dartc', 'samples', 'standalone', 'corelib', 'co19', 'language',
            'isolate', 'stub-generator', 'vm'];
 
@@ skipping 34 matching lines @@
               ['-m', '--mode'],
               ['all', 'debug', 'release'],
               'debug'),
           new _TestOptionSpecification(
               'component',
               'The component to test against',
               ['-c', '--component'],
               ['most', 'vm', 'dartc', 'frog', 'frogsh', 'leg'],
               'vm'),
           new _TestOptionSpecification(
-              'architecture',
+              'arch',
               'The architecture to run tests for',
               ['-a', '--arch'],
               ['all', 'ia32', 'x64', 'simarm'],
               'ia32'),
           new _TestOptionSpecification(
               'system',
               'The operating system to run tests on',
               ['-s', '--system'],
               ['linux', 'macos', 'windows'],
               new Platform().operatingSystem()),
@@ skipping 30 matching lines @@
               ['-j', '--tasks'],
               [],
               new Platform().numberOfProcessors(),
               'int'),
           new _TestOptionSpecification(
               'help',
               'Print list of options',
               ['-h', '--help'],
               [],
               false,
+              'bool'),
+          new _TestOptionSpecification(
+              'verbose',
+              'Verbose output',
+              ['-v', '--verbose'],
+              [],
+              false,
               'bool')];
   }
 
 
   /**
    * Parse a list of strings as test options.
    *
    * Returns a list of configurations in which to run the
    * tests. Configurations are maps mapping from option keys to
    * values. When encountering the first non-option string, the rest
@@ skipping 29 matching lines @@
       } else if (arg.startsWith('-')) {
         if (arg == '-h') {
           _printHelp();
           return null;
         }
         if (arg.length > 2) {
           name = arg.substring(0, 2);
           value = arg.substring(2, arg.length);
         } else {
           name = arg;
-          if ((i + 1) >= arguments.length) {
-            print('No value supplied for option $name');
-            return null;
+          // Boolean options do not have a value.
+          if (_getSpecification(name).type != 'bool') {
+            if ((i + 1) >= arguments.length) {
+              print('No value supplied for option $name');
+              return null;
+            }
+            value = arguments[++i];
           }
-          value = arguments[++i];
         }
       } else {
         // The argument does not start with '-' or '--' and is
         // therefore not an option. We use it as a test selection
         // pattern.
         configuration.putIfAbsent('selectors', () => []);
         var patterns = configuration['selectors'];
         patterns.add(arg);
         continue;
       }
@@ skipping 40 matching lines @@
   List<Map> _expandConfigurations(Map configuration) {
 
     // TODO(ager): Get rid of this. This is for backwards
     // compatibility with the python test scripts. They use system
     // 'win32' for Windows.
     if (configuration['system'] == 'windows') {
       configuration['system'] = 'win32';
     }
 
     // Expand the pseudo-values such as 'all'.
-    if (configuration['architecture'] == 'all') {
-      configuration['architecture'] = 'ia32,x64,simarm';
+    if (configuration['arch'] == 'all') {
+      configuration['arch'] = 'ia32,x64,simarm';
     }
     if (configuration['mode'] == 'all') {
       configuration['mode'] = 'debug,release';
     }
     if (configuration['component'] == 'most') {
       configuration['component'] = 'vm,dartc';
     }
 
+    // Use verbose progress indication for verbose output.
+    if (configuration['verbose']) {
+      configuration['progress'] = 'verbose';
+    }
+
     // Create the artificial 'unchecked' option that test status files
     // expect.
     configuration['unchecked'] = !configuration['checked'];
 
     // Expand the test selectors into a suite name and a simple
     // regular expressions to be used on the full path of a test file
     // in that test suite. If no selectors are explicitly given use
     // the default suite patterns.
     var selectors = configuration['selectors'];
     if (selectors is !Map) {
@@ skipping 16 matching lines @@
         if (selectorMap.containsKey(suite)) {
           print("Warning: selector '$suite/$pattern' overrides " +
                 "previous selector for suite '$suite'");
         }
         selectorMap[suite] = new RegExp(pattern);
       }
       configuration['selectors'] = selectorMap;
     }
 
     // Expand the architectures.
-    var archs = configuration['architecture'];
+    var archs = configuration['arch'];
     if (archs.contains(',')) {
       var result = new List<Map>();
       for (var arch in archs.split(',')) {
         var newConfiguration = new Map.from(configuration);
-        newConfiguration['architecture'] = arch;
+        newConfiguration['arch'] = arch;
         result.addAll(_expandConfigurations(newConfiguration));
       }
       return result;
     }
 
     // Expand modes.
     var modes = configuration['mode'];
     if (modes.contains(',')) {
       var result = new List<Map>();
       for (var mode in modes.split(',')) {
@@ skipping 85 matching lines @@
       if (option.keys.some((key) => key == name)) {
         return option;
       }
     }
     return null;
   }
 
 
   List<_TestOptionSpecification> _options;
 }