Add check for repeated options on test.dart command line. Revert debugging commit r3110.

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', 'client'];
 
@@ skipping 153 matching lines @@
    * 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
    * of the arguments are stored in the returned Map under the 'rest'
    * key.
    */
   List<Map> parse(List<String> arguments) {
     var configuration = new Map();
-    // Build configuration of default values.
-    for (var option in _options) {
-      configuration[option.name] = option.defaultValue;
-    }
-    // Overwrite with the arguments passed to the test script.
+    // Fill in configuration with arguments passed to the test script.
     var numArguments = arguments.length;
     for (var i = 0; i < numArguments; i++) {
       // Extract name and value for options.
-      var arg = arguments[i];
-      var name = '';
-      var value = '';
+      String arg = arguments[i];
+      String name = '';
+      String value = '';
+      _TestOptionSpecification spec;
       if (arg.startsWith('--')) {
         if (arg == '--help') {
           _printHelp();
           return null;
         }
         var split = arg.indexOf('=');
         if (split == -1) {
           name = arg;
+          spec = _getSpecification(name);
           // Boolean options do not have a value.
-          if (_getSpecification(name).type != 'bool') {
+          if (spec.type != 'bool') {
             if ((i + 1) >= arguments.length) {
               print('No value supplied for option $name');
               return null;
             }
             value = arguments[++i];
           }
         } else {
           name = arg.substring(0, split);
+          spec = _getSpecification(name);
           value = arg.substring(split + 1, arg.length);
         }
       } else if (arg.startsWith('-')) {
         if (arg == '-h') {
           _printHelp();
           return null;
         }
         if (arg.length > 2) {
           name = arg.substring(0, 2);
+          spec = _getSpecification(name);
           value = arg.substring(2, arg.length);
         } else {
           name = arg;
+          spec = _getSpecification(name);
           // Boolean options do not have a value.
-          if (_getSpecification(name).type != 'bool') {
+          if (spec.type != 'bool') {
             if ((i + 1) >= arguments.length) {
               print('No value supplied for option $name');
               return null;
             }
             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;
       }
-      // Find the option specification for the name.
-      var spec = _getSpecification(name);
-      if (spec == null) {
-        print('Unknown test option $name');
+
+
+      // Multiple uses of a flag are an error, because there is no
+      // naturally correct way to handle conflicting options.
+      if (configuration.containsKey(spec.name)) {
+        print('Multiple "--${spec.name}" flags on command line');

[Emily Fortuna, 2012/01/10 23:24:00]

Slightly more informative error message:
print ('Error: test.dart does not accept multiple[...]')  ?

         exit(1);
       }
       // Parse the value for the option.
       if (spec.type == 'bool') {
         if (!value.isEmpty()) {
           print('No value expected for bool option $name');
           exit(1);
         }
         configuration[spec.name] = true;
       } else if (spec.type == 'int') {
         try {
           configuration[spec.name] = Math.parseInt(value);
         } catch (var e) {
           print('Integer value expected for int option $name');
           exit(1);
         }
       } else {
         assert(spec.type == 'string');
         if (!spec.values.isEmpty()) {
           for (var v in value.split(',')) {
             if (spec.values.lastIndexOf(v) == -1) {
               print('Unknown value ($v) for option $name');
               exit(1);
             }
           }
         }
         configuration[spec.name] = value;
       }
     }
-    
+
+    // Apply default values for unspecified options.
+    for (var option in _options) {
+      if (!configuration.containsKey(option.name)) {
+        configuration[option.name] = option.defaultValue;
+      }
+    }
+
     return _expandConfigurations(configuration);
   }
 
 
   /**
    * Recursively expand a configuration with multiple values per key
    * into a list of configurations with exactly one value per key.
    */
   List<Map> _expandConfigurations(Map configuration) {
 
@@ skipping 165 matching lines @@
 
   /**
    * Find the test option specification for a given option key.
    */
   _TestOptionSpecification _getSpecification(String name) {
     for (var option in _options) {
       if (option.keys.some((key) => key == name)) {
         return option;
       }
     }
-    return null;
+    print('Unknown test option $name');
+    exit(1);
   }
 
 
   List<_TestOptionSpecification> _options;
 }