| Index: tools/testing/dart/test_suite.dart
|
| diff --git a/tools/testing/dart/test_suite.dart b/tools/testing/dart/test_suite.dart
|
| index bd0ddbd3790bdb07c51948331ff964488f75231b..075faf1f8aaf401406a8ad93300a70e42b3eea50 100644
|
| --- a/tools/testing/dart/test_suite.dart
|
| +++ b/tools/testing/dart/test_suite.dart
|
| @@ -468,7 +468,7 @@ class StandardTestSuite extends TestSuite {
|
| recursive: true);
|
| }
|
|
|
| - Collection<Uri> get dart2JsBootstrapDependencies {
|
| + List<Uri> get dart2JsBootstrapDependencies {
|
| if (!useSdk) return [];
|
|
|
| var snapshotPath = TestUtils.absolutePath(new Path(buildDir).join(
|
| @@ -853,7 +853,8 @@ class StandardTestSuite extends TestSuite {
|
| crossOriginPort = configuration['_servers_'].crossOriginPort;
|
| }
|
|
|
| - var url= 'http://127.0.0.1:$serverPort$pathComponent'
|
| + var local_ip = configuration['local_ip'];
|
| + var url= 'http://$local_ip:$serverPort$pathComponent'
|
| '?crossOriginPort=$crossOriginPort';
|
| if (info.optionsFromFile['isMultiHtmlTest'] && subtestNames.length > 0) {
|
| url= '${url}&group=${subtestNames[subtestIndex]}';
|
| @@ -872,6 +873,7 @@ class StandardTestSuite extends TestSuite {
|
| dartWrapper.closeSync();
|
| }
|
|
|
| +
|
| /**
|
| * The [StandardTestSuite] has support for tests that
|
| * compile a test from Dart to JavaScript, and then run the resulting
|
| @@ -975,6 +977,7 @@ class StandardTestSuite extends TestSuite {
|
| }
|
| }
|
|
|
| +
|
| // Variables for browser multi-tests.
|
| List<String> subtestNames = info.optionsFromFile['subtestNames'];
|
| TestCase multitestParentTest;
|
| @@ -1678,7 +1681,7 @@ class LastModifiedCache {
|
| _cache[uri.path] = file.existsSync() ? file.lastModifiedSync() : null;
|
| return _cache[uri.path];
|
| }
|
| - return new Date.now();
|
| + return new DateTime.now();
|
| }
|
| }
|
|
|
| @@ -1811,7 +1814,8 @@ class TestUtils {
|
| 'safari',
|
| 'opera',
|
| 'chrome',
|
| - 'ff'
|
| + 'ff',
|
| + 'chromeOnAndroid',
|
| ];
|
| return BROWSERS.contains(runtime);
|
| }
|
|
|