Support for pixel layout tests.

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.
 
 /** Create and return an options parser for the test runner. */
 ArgParser getOptionParser() {
   var parser = new ArgParser();
 
   parser.addOption('help', abbr: '?',
       help: 'Show usage information.');
 
   parser.addOption('runtime', abbr: 'r', defaultsTo: 'vm',
       help: 'Where the tests should be run.',
       allowed: ['vm', 'drt-dart', 'drt-js'],
       allowedHelp: {
         'vm': 'Run Dart code natively on the standalone dart vm.',
         'drt-dart': 'Run Dart code natively in the headless version of\n'
           'Chrome, DumpRenderTree.',
         'drt-js': 'Run Dart compiled to JavaScript in the headless version\n'
             'of Chrome, DumpRenderTree.'
       });
 
   parser.addFlag('checked', defaultsTo: false,
       help: 'Run tests in checked mode.');
 
-  parser.addFlag('layout', defaultsTo: false,
-      help: 'Run layout tests.');
+  parser.addFlag('layout-text', defaultsTo: false,
+      help: 'Run text layout tests.');
+
+  parser.addFlag('layout-pixel', defaultsTo: false,
+      help: 'Run pixel layout tests.');
 
   parser.addOption('timeout', abbr: 't',
       help: 'Timeout in seconds', defaultsTo: '60');
 
   parser.addOption('tasks', abbr: 'j',
       defaultsTo: Platform.numberOfProcessors.toString(),
       help: 'The number of parallel tasks to run.');
 
   parser.addOption('out', abbr: 'o', defaultsTo: 'stdout',
       help: 'File to send test results. This should be a '
@@ skipping 92 matching lines @@
   parser.addFlag('recurse', abbr: 'R',
       help: 'Recurse through child directories looking for tests.',
       defaultsTo: false);
 
   parser.addFlag('immediate',
       help: 'Print test results immediately, instead of at the end of a test '
         'file. Note that in some async cases this may result in multiple '
         'messages for a single test.',
       defaultsTo: false);
 
-  parser.addFlag('generate-renders',
-      help: 'Generate .render files for layout tests.',
+  parser.addFlag('regenerate',
+      help: 'Regenerate layout test expectation files.',
       defaultsTo: false);
 
   parser.addOption('unittest',  help: '#import path for unit test library.');
 
   return parser;
 }
 
 /** Print a value option, quoting it if it has embedded spaces. */
 _printValueOption(String name, value, OutputStream stream) {
   if (value.indexOf(' ') >= 0) {
@@ skipping 87 matching lines @@
   }
   if (config['unittest'] == null) {
     print('Missing required option --unittest');
     return false;
   }
   if (config['include'].length > 0 &&
       config['exclude'].length > 0) {
     print('--include and --exclude are mutually exclusive.');
     return false;
   }
-  if (config['layout'] && config['runtime'] == 'vm') {
+  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;
 }