Fix static warnings in test_suite.dart from local variables shadowing parameters or functions.

tools/testing/dart/test_suite.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.
 
 /**
  * Classes and methods for enumerating and preparing tests.
  *
  * This library includes:
  *
  * - Creating tests by listing all the Dart files in certain directories,
@@ skipping 381 matching lines @@
   }
 
   void processFile(String filename) {
     if (!isTestFile(filename)) return;
 
     // Only run the tests that match the pattern.
     RegExp pattern = configuration['selectors'][suiteName];
     if (!pattern.hasMatch(filename)) return;
     if (filename.endsWith('test_config.dart')) return;
 
-    var optionsFromFile = optionsFromFile(filename);
+    var optionsFromFile = readOptionsFromFile(filename);
     Function createTestCase = makeTestCaseCreator(optionsFromFile);
 
     if (optionsFromFile['isMultitest']) {
       testGeneratorStarted();
       DoMultitest(filename,
                   TestUtils.buildDir(configuration),
                   directoryPath,
                   createTestCase,
                   testGeneratorDone);
     } else {
@@ skipping 306 matching lines @@
       args.add('--fatal-type-errors');
     }
 
     bool isMultitest = optionsFromFile["isMultitest"];
     List<String> dartOptions = optionsFromFile["dartOptions"];
     List<List<String>> vmOptionsList = optionsFromFile["vmOptions"];
     Expect.isTrue(!isMultitest || dartOptions == null);
     if (dartOptions == null) {
       args.add(filename);
     } else {
-      var filename = dartOptions[0];
+      var executable_name = dartOptions[0];
       // TODO(ager): Get rid of this hack when the runtime checkout goes away.
-      var file = new File(filename);
+      var file = new File(executable_name);
       if (!file.existsSync()) {
-        filename = '../$filename';
-        Expect.isTrue(new File(filename).existsSync());
-        dartOptions[0] = filename;
+        executable_name = '../$filename';
+        Expect.isTrue(new File(executable_name).existsSync());
+        dartOptions[0] = executable_name;
       }
       args.addAll(dartOptions);
     }
 
     var result = new List<List<String>>();
     Expect.isFalse(vmOptionsList.isEmpty(), "empty vmOptionsList");
     for (var vmOptions in vmOptionsList) {
       var options = new List<String>.from(vmOptions);
       options.addAll(args);
       result.add(options);
     }
 
     return result;
   }
 
-  Map optionsFromFile(String filename) {
+  Map readOptionsFromFile(String filename) {
     RegExp testOptionsRegExp = const RegExp(@"// VMOptions=(.*)");
     RegExp dartOptionsRegExp = const RegExp(@"// DartOptions=(.*)");
     RegExp multiTestRegExp = const RegExp(@"/// [0-9][0-9]:(.*)");
     RegExp leadingHashRegExp = const RegExp(@"^#", multiLine: true);
     RegExp isolateStubsRegExp = const RegExp(@"// IsolateStubs=(.*)");
     RegExp domImportRegExp =
         const RegExp(@"^#import.*(dart:(dom|html)|html\.dart).*\)",
                      multiLine: true);
     RegExp libraryDefinitionRegExp =
         const RegExp(@"^#library\(", multiLine: true);
@@ skipping 292 matching lines @@
     if (name == '') {
       name = '${buildDir(configuration)}/${compilerName(configuration)}';
     }
     if (!(new File(name)).existsSync() && !configuration['list']) {
       throw "Executable '$name' does not exist";
     }
     return name;
   }
 
   static String outputDir(Map configuration) {
-    var outputDir = '';
+    var result = '';
     var system = configuration['system'];
     if (system == 'linux') {
-      outputDir = 'out/';
+      result = 'out/';
     } else if (system == 'macos') {
-      outputDir = 'xcodebuild/';
+      result = 'xcodebuild/';
     }
-    return outputDir;
+    return result;
   }
 
   static String buildDir(Map configuration) {
-    var buildDir = outputDir(configuration);
-    buildDir += (configuration['mode'] == 'debug') ? 'Debug_' : 'Release_';
-    buildDir += configuration['arch'];
-    return buildDir;
+    var result = outputDir(configuration);
+    result += (configuration['mode'] == 'debug') ? 'Debug_' : 'Release_';
+    result += configuration['arch'];
+    return result;
   }
 
   static String dartDir() {
     String scriptPath = new Options().script.replaceAll('\\', '/');
     String toolsDir = scriptPath.substring(0, scriptPath.lastIndexOf('/'));
     return new File('$toolsDir/..').fullPathSync().replaceAll('\\', '/');
   }
 
   static List<String> standardOptions(Map configuration) {
     List args = ["--ignore-unrecognized-flags"];
@@ skipping 53 matching lines @@
  * $noCrash tests are expected to be flaky but not crash
  * $pass tests are expected to pass
  * $failOk tests are expected to fail that we won't fix
  * $fail tests are expected to fail that we should fix
  * $crash tests are expected to crash that we should fix
  * $timeout tests are allowed to timeout
 """;
     print(report);
    }
 }