| Index: tools/testing/dart/test_suite.dart
|
| diff --git a/tools/testing/dart/test_suite.dart b/tools/testing/dart/test_suite.dart
|
| index 523778bb54d20d43be585ecbb748b22f88855303..4d0447275815800715b575d2e178214739be9c54 100644
|
| --- a/tools/testing/dart/test_suite.dart
|
| +++ b/tools/testing/dart/test_suite.dart
|
| @@ -969,9 +969,10 @@ class StandardTestSuite extends TestSuite {
|
| 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());
|
| @@ -1197,11 +1198,11 @@ class StandardTestSuite extends TestSuite {
|
| }
|
|
|
| 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";
|
| }
|
|
|
| /**
|
|
|