| Index: tools/testing/dart/test_runner.dart
|
| diff --git a/tools/testing/dart/test_runner.dart b/tools/testing/dart/test_runner.dart
|
| index 3dbca06f42879e023b4e59c686d996e1d33585cb..e9d5683832cff106e258d24c71920898fd1a14af 100644
|
| --- a/tools/testing/dart/test_runner.dart
|
| +++ b/tools/testing/dart/test_runner.dart
|
| @@ -81,7 +81,7 @@ class Command {
|
|
|
| /** Command line arguments to the executable. */
|
| List<String> arguments;
|
| -
|
| +
|
| /** Environment for the command */
|
| Map<String,String> environment;
|
|
|
| @@ -201,7 +201,7 @@ class DumpRenderTreeCommand extends Command {
|
| arguments.add(htmlFile);
|
| return arguments;
|
| }
|
| -
|
| +
|
| Path get expectedOutputFile => expectedOutputPath;
|
| bool get isPixelTest => (expectedOutputFile != null &&
|
| expectedOutputFile.filename.endsWith(".png"));
|
| @@ -227,7 +227,7 @@ class DumpRenderTreeCommand extends Command {
|
| */
|
| class TestCase {
|
| /**
|
| - * A list of commands to execute. Most test cases have a single command.
|
| + * A list of commands to execute. Most test cases have a single command.
|
| * Dart2js tests have two commands, one to compile the source and another
|
| * to execute it. Some isolate tests might even have three, if they require
|
| * compiling multiple sources that are run in isolation.
|
| @@ -369,7 +369,7 @@ class BrowserTestCase extends TestCase {
|
| * first).
|
| */
|
| bool waitingForOtherTest;
|
| -
|
| +
|
| /**
|
| * The set of test cases that wish to be notified when this test has
|
| * completed.
|
| @@ -409,7 +409,7 @@ class BrowserTestCase extends TestCase {
|
|
|
|
|
| /**
|
| - * CommandOutput records the output of a completed command: the process's exit
|
| + * CommandOutput records the output of a completed command: the process's exit
|
| * code, the standard output and standard error, whether the process timed out,
|
| * and the time the process took to run. It also contains a pointer to the
|
| * [TestCase] this is the output of.
|
| @@ -631,7 +631,7 @@ class BrowserCommandOutputImpl extends CommandOutputImpl {
|
| if ((testCase as BrowserTestCase).numRetries > 0) {
|
| requestRetry = true;
|
| }
|
| - printDebug("Failed because of missing XDisplay");
|
| + printDebug("Test failure because of missing XDisplay");
|
| return true;
|
| }
|
| }
|
| @@ -680,27 +680,27 @@ class BrowserCommandOutputImpl extends CommandOutputImpl {
|
| startPosition,
|
| endPosition - startPosition);
|
| if (_failed) {
|
| - printDebug("Failed because command.expectedOutputFile doesn't "
|
| - "match stdout of DRT");
|
| + printDebug("Test failure because command.expectedOutputFile "
|
| + "doesn't match stdout of DRT");
|
| }
|
| return _failed;
|
| }
|
| }
|
| - printDebug("Failed because we didn't find 'Content-Length' in the DRT "
|
| - "output");
|
| + printDebug("Test failure because we didn't find 'Content-Length' in the"
|
| + " DRT output");
|
| return true;
|
| } else {
|
| var _failed = !areByteArraysEqual(expectedContent, 0,
|
| stdout, 0,
|
| stdout.length);
|
| if (_failed) {
|
| - printDebug("Failed because command.expectedOutputFile doesn't match "
|
| - "stdout of DRT");
|
| + printDebug("Test failure because command.expectedOutputFile doesn't "
|
| + "match stdout of DRT");
|
| }
|
| return _failed;
|
| }
|
| }
|
| - printDebug("Failed because command.expectedOutputFile doesn't exist");
|
| + printDebug("Test failure because command.expectedOutputFile doesn't exist");
|
| return true;
|
| }
|
|
|
| @@ -718,15 +718,16 @@ class BrowserCommandOutputImpl extends CommandOutputImpl {
|
| if (has_content_type) {
|
| var _failed = (exitCode != 0 && !hasCrashed);
|
| if (_failed) {
|
| - printDebug("Failed because '(exitCode != 0 && !hasCrashed) was "
|
| - "true");
|
| + printDebug("Test failure because '(exitCode != 0 && !hasCrashed) "
|
| + "was true");
|
| }
|
| return _failed;
|
| }
|
| break;
|
| }
|
| }
|
| - printDebug("Failed because content-type: text/plain + PASS was not found");
|
| + printDebug("Test failure because content-type: text/plain + PASS was not "
|
| + "found");
|
| return true;
|
| }
|
|
|
|
|