Big merge from experimental to bleeding edge.

tools/testing/dart/test_options.dart

Index: tools/testing/dart/test_options.dart
diff --git a/tools/testing/dart/test_options.dart b/tools/testing/dart/test_options.dart
index 8f9232b4b66810dfe323bd2f417d42b2d7c504e2..40d75c51a05ce1f5ff4dafd8f26654468474dbb8 100644
--- a/tools/testing/dart/test_options.dart
+++ b/tools/testing/dart/test_options.dart
@@ -5,7 +5,6 @@
 library test_options_parser;
 
 import "dart:io";
-import "dart:math";
 import "drt_updater.dart";
 import "test_suite.dart";
 
@@ -149,7 +148,7 @@ is 'dart file.dart' and you specify special command
               'Progress indication mode',
               ['-p', '--progress'],
               ['compact', 'color', 'line', 'verbose',
-               'silent', 'status', 'buildbot'],
+               'silent', 'status', 'buildbot', 'diff'],
               'compact'),
           new _TestOptionSpecification(
               'step_name',
@@ -368,7 +367,7 @@ Note: currently only implemented for dart2js.''',
         configuration[spec.name] = true;
       } else if (spec.type == 'int') {
         try {
-          configuration[spec.name] = parseInt(value);
+          configuration[spec.name] = int.parse(value);
         } catch (e) {
           print('Integer value expected for int option $name');
           exit(1);