Dart test scripts: fix progress time indication.

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 ['standalone', 'corelib', 'co19'];
 
 /**
  * Specification of a single test option.
@@ skipping 127 matching lines @@
           _printHelp();
           return null;
         }
         name = arg;
         if ((i + 1) >= arguments.length) {
           print('No value supplied for option $name');
           return null;
         }
         value = arguments[++i];
       } else {
-        // The option name does not start with '-' or '--' so we
-        // assume that the rest of the arguments specify tests or test
-        // suites to run.
-        configuration['patterns'] = arguments.getRange(i, numArguments - i);
-        return _expandConfigurations(configuration);
+        // The argument does not start with '-' or '--' and is
+        // therefore not an option. We use it as a test selection
+        // pattern.
+        var patterns = configuration['patterns'];
+        if (patterns == null) {
+          configuration['patterns'] = patterns = new List();
+        }
+        patterns.add(arg);
+        continue;

[Bill Hesse, 2011/11/17 09:17:53]

Nice.  I was thinking that it is annoying not to allow options to be tacked on
at the end of the command line.

       }
       // Find the option specification for the name.
       var spec = _getSpecification(name);
       if (spec == null) {
         print('Unknown test option $name');
         return null;
       }
       // Parse the value for the option.
       if (spec.type == 'bool') {
         if (!value.isEmpty()) {
@@ skipping 45 matching lines @@
     configuration['unchecked'] = !configuration['checked'];
 
     // Expand the test selectors into simple regular expressions to be
     // used on the full path of a test file. If no selectors are
     // explicitly given use the default suite patterns.
     List patterns = configuration['patterns'];
     if (patterns == null) {
       patterns = new List.from(defaultTestSelectors);
     }
     for (var i = 0; i < patterns.length; i++) {
+      if (patterns[i] is RegExp) continue;
       patterns[i] = patterns[i].replaceAll('*', '.*');
       patterns[i] = patterns[i].replaceAll('/', '.*');
       patterns[i] = new RegExp(patterns[i]);
     }
     configuration['patterns'] = patterns;
 
     // Expand the architectures.
     var archs = configuration['architecture'];
     if (archs.contains(',')) {
       var result = new List<Map>();
@@ skipping 98 matching lines @@
       if (option.keys.some((key) => key == name)) {
         return option;
       }
     }
     return null;
   }
 
 
   List<_TestOptionSpecification> _options;
 }