Big merge from experimental to bleeding edge.

utils/testrunner/options.dart

 // Copyright (c) 2012, 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.
 
 part of testrunner;
 
 /** Create and return an options parser for the test runner. */
 ArgParser getOptionParser() {
   var parser = new ArgParser();
 
@@ skipping 182 matching lines @@
 /**
  * Get the test runner configuration. This loads options from multiple
  * sources, in increasing order of priority: a test.config file in the
  * current directory, a test config file specified with --configfile on
  * the command line, and other arguments specified on the command line.
  */
 ArgResults loadConfiguration(optionsParser) {
   var options = new List();
   // We first load options from a test.config file in the working directory.
   options.addAll(getFileContents('test.config', false).
-      filter((e) => e.trim().length > 0 && e[0] != '#'));
+      where((e) => e.trim().length > 0 && e[0] != '#'));
   // Next we look to see if the command line included a -testconfig argument,
   // and if so, load options from that file too; where these are not
   // multi-valued they will take precedence over the ones in test.config.
   var commandLineArgs = new Options().arguments;
   var cfgarg = '--configfile';
   for (var i = 0; i < commandLineArgs.length; i++) {
     if (commandLineArgs[i].startsWith(cfgarg)) {
       if (commandLineArgs[i] == cfgarg) {
         if (i == commandLineArgs.length - 1) {
           throw new Exception('Missing argument to $cfgarg');
         }
         options.addAll(getFileContents(commandLineArgs[++i], true).
-            filter((e) => e.trim().length > 0 && e[0] != '#'));
+            where((e) => e.trim().length > 0 && e[0] != '#'));
       } else if (commandLineArgs[i].startsWith('$cfgarg=')) {
         options.addAll(
             getFileContents(commandLineArgs[i].substring(cfgarg.length), true).
-                filter((e) => e.trim().length > 0 && e[0] != '#'));
+                where((e) => e.trim().length > 0 && e[0] != '#'));
       } else {
         throw new Exception('Missing argument to $cfgarg');
       }
     }
   }
   // Finally, we add options from the command line. These have the highest
   // precedence of all.
   options.addAll(commandLineArgs);
   // Now try parse the whole collection of options, and if this fails,
   // issue a usage message.
@@ skipping 25 matching lines @@
     print('--include and --exclude are mutually exclusive.');
     return false;
   }
   if ((config['layout-text'] || config['layout-pixel']) &&
       config['runtime'] == 'vm') {
     print('Layout tests must use --runtime values of "drt-dart" or "drt-js"');
     return false;
   }
   return true;
 }