Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1288)

Unified Diff: tools/testing/dart/test_runner.dart

Issue 11810004: Make browser tests all run from a server instead of the local filesystem. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: tools/testing/dart/test_runner.dart
diff --git a/tools/testing/dart/test_runner.dart b/tools/testing/dart/test_runner.dart
index 2ee8218e67325912cf31bb6ef66875ba18eec5f9..a6a3c7c2581a9254f6d55d378e512132262788ee 100644
--- a/tools/testing/dart/test_runner.dart
+++ b/tools/testing/dart/test_runner.dart
@@ -20,6 +20,7 @@ import "dart:uri";
import "status_file_parser.dart";
import "test_progress.dart";
import "test_suite.dart";
+import "http_server.dart" as http_server;
const int NO_TIMEOUT = 0;
const int SLOW_TIMEOUT_MULTIPLIER = 4;
@@ -179,25 +180,20 @@ class DumpRenderTreeCommand extends Command {
String htmlFile,
List<String> options,
List<String> dartFlags,
- Uri packageRootUri,
io.Path this.expectedOutputPath)
: super(executable,
_getArguments(options, htmlFile),
- _getEnvironment(dartFlags, packageRootUri));
+ _getEnvironment(dartFlags));
- static Map _getEnvironment(List<String> dartFlags, Uri packageRootUri) {
+ static Map _getEnvironment(List<String> dartFlags) {
var needDartFlags = dartFlags != null && dartFlags.length > 0;
- var needDartPackageRoot = packageRootUri != null;
var env = null;
- if (needDartFlags || needDartPackageRoot) {
+ if (needDartFlags) {
env = new Map.from(io.Platform.environment);
if (needDartFlags) {
env['DART_FLAGS'] = Strings.join(dartFlags, " ");
}
- if (needDartPackageRoot) {
- env['DART_PACKAGE_ROOT'] = packageRootUri.toString();
- }
}
return env;
@@ -1711,6 +1707,16 @@ class ProcessQueue {
}
if (_verbose) {
int i = 1;
+ if (test is BrowserTestCase) {
+ // Additional command for rerunning the steps locally after the fact.
+ print('$i. ${TestUtils.dartTestExecutable.toNativePath()} '
+ '${TestUtils.dartDir().toNativePath()}/tools/testing/dart/'
+ 'http_server.dart -m ${test.configuration["mode"]} '
+ '-a ${test.configuration["arch"]} '
+ '-p ${http_server.TestingServerRunner.serverList[0].port} '
+ '-c ${http_server.TestingServerRunner.serverList[1].port}');
+ i++;
+ }
for (Command command in test.commands) {
print('$i. ${command.commandLine}');
i++;

Powered by Google App Engine
This is Rietveld 408576698