Fixed bug in r16247: variable naming issues

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 951 matching lines @@
 
           if (compiler == 'none' || compiler == 'dart2dart') {
             dartFlags.add('--ignore-unrecognized-flags');
             if (configuration["checked"]) {
               dartFlags.add('--enable_asserts');
               dartFlags.add("--enable_type_checks");
             }
             dartFlags.addAll(vmOptions);
           }
           if (compiler == 'none') {
-            var packageRoot = packageRoot(optionsFromFile['packageRoot']);
-            if (packageRoot != null) {
-              var absolutePath = TestUtils.absolutePath(new Path(packageRoot));
+            var packageRootPath = packageRoot(optionsFromFile['packageRoot']);
+            if (packageRootPath != null) {
+              var absolutePath = 
+                  TestUtils.absolutePath(new Path(packageRootPath));
               packageRootUri = new Uri.fromComponents(
                   scheme: 'file',
                   path: absolutePath.toString());
             }
           }
 
           if (expectedOutput != null) {
             if (expectedOutput.toNativePath().endsWith('.png')) {
               // pixel tests are specified by running DRT "foo.html'-p"
               dumpRenderTreeOptions.add('--notree');
@@ skipping 205 matching lines @@
       return null;
     }
     String packageRoot = packageRootFromFile;
     if (packageRootFromFile == null) {
       packageRoot = "$buildDir/packages/";
     }
     return packageRoot;
   }
 
   String packageRootArgument(String packageRootFromFile) {
-    var packageRoot = packageRoot(packageRootFromFile);
-    if (packageRoot == null) {
+    var packageRootPath = packageRoot(packageRootFromFile);
+    if (packageRootPath == null) {
       return null;
     }
-    return "--package-root=$packageRoot";
+    return "--package-root=$packageRootPath";
   }
 
   /**
    * Special options for individual tests are currently specified in various
    * ways: with comments directly in test files, by using certain imports, or by
    * creating additional files in the test directories.
    *
    * Here is a list of options that are used by 'test.dart' today:
    *   - Flags can be passed to the vm or dartium process that runs the test by
    *   adding a comment to the test file:
@@ skipping 577 matching lines @@
  * $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
  * $compileErrorSkip tests are skipped on browsers due to compile-time error
 """;
     print(report);
    }
 }