Remove pixel/layout tests in tests/utils + special casing in the testing scripts for pixel/layout t…

tools/testing/dart/test_runner.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 executing tests.
  *
  * This module includes:
  * - Managing parallel execution of tests, including timeout checks.
  * - Evaluating the output of each test as pass/fail/crash/timeout.
@@ skipping 139 matching lines @@
           return false;
         }
       }
     }
     return true;
   }
 
   String toString() => commandLine;
 
   Future<bool> get outputIsUpToDate => new Future.value(false);
-  Path get expectedOutputFile => null;
-  bool get isPixelTest => false;
 }
 
 class CompilationCommand extends Command {
   String _outputFile;
   bool _neverSkipCompilation;
   List<Uri> _bootstrapDependencies;
 
   CompilationCommand._(String displayName,
                        this._outputFile,
                        this._neverSkipCompilation,
@@ skipping 66 matching lines @@
           return false;
         }
       }
       return true;
     }
     return false;
   }
 }
 
 class ContentShellCommand extends Command {
-  /**
-   * If [expectedOutputPath] is set, the output of content shell is compared
-   * with the content of [expectedOutputPath].
-   * This is used for example for pixel tests, where [expectedOutputPath] points
-   * to a *png file.
-   */
-  Path expectedOutputPath;
-
   ContentShellCommand._(String executable,
                         String htmlFile,
                         List<String> options,
                         List<String> dartFlags,
-                        Path this.expectedOutputPath,
                         String configurationDir)
       : super._("content_shell",
                executable,
                _getArguments(options, htmlFile),
                configurationDir,
                _getEnvironment(dartFlags));
 
   static Map _getEnvironment(List<String> dartFlags) {
     var needDartFlags = dartFlags != null && dartFlags.length > 0;
 
     var env = null;
     if (needDartFlags) {
       env = new Map<String, String>();
       env['DART_FLAGS'] = dartFlags.join(" ");
       env['DART_FORWARDING_PRINT'] = '1';
     }
 
     return env;
   }
 
   static List<String> _getArguments(List<String> options, String htmlFile) {
     var arguments = new List.from(options);
     arguments.add(htmlFile);
     return arguments;
   }
 
-  Path get expectedOutputFile => expectedOutputPath;
-  bool get isPixelTest => (expectedOutputFile != null &&
-                           expectedOutputFile.filename.endsWith(".png"));
-
-  void _buildHashCode(HashCodeBuilder builder) {
-    super._buildHashCode(builder);
-    builder.add(expectedOutputPath.toString());
-  }
-
   bool _equal(Command other) {
-    return
-        other is ContentShellCommand &&
-        super._equal(other) &&
-        expectedOutputPath.toString() == other.expectedOutputPath.toString();
+    return other is ContentShellCommand && super._equal(other);
   }
 
   int get maxNumRetries => 3;
 }
 
 class BrowserTestCommand extends Command {
   final String browser;
   final String url;
 
   BrowserTestCommand._(String _browser,
@@ skipping 93 matching lines @@
   static final instance = new CommandBuilder._();
 
   final _cachedCommands = new Map<Command, Command>();
 
   CommandBuilder._();
 
   ContentShellCommand getContentShellCommand(String executable,
                                              String htmlFile,
                                              List<String> options,
                                              List<String> dartFlags,
-                                             Path expectedOutputPath,
                                              String configurationDir) {
     ContentShellCommand command = new ContentShellCommand._(
-        executable, htmlFile, options, dartFlags, expectedOutputPath,
-        configurationDir);
+        executable, htmlFile, options, dartFlags, configurationDir);
     return _getUniqueCommand(command);
   }
 
   BrowserTestCommand getBrowserTestCommand(String browser,
                                            String url,
                                            String executable,
                                            List<String> arguments,
                                            String configurationDir) {
     var command = new BrowserTestCommand._(
         browser, url, executable, arguments, configurationDir);
@@ skipping 390 matching lines @@
 
   bool get hasCrashed {
     return super.hasCrashed || _rendererCrashed;
   }
 
   Expectation _getOutcome() {
     if (_failedBecauseOfMissingXDisplay) {
       return Expectation.FAIL;
     }
 
-    if (command.expectedOutputFile != null) {
-      // We are either doing a pixel test or a layout test with content shell
-      if (_failedBecauseOfUnexpectedDRTOutput) {
-        return Expectation.FAIL;
-      }
-    }
     if (_browserTestFailure) {
       return Expectation.RUNTIME_ERROR;
     }
     return Expectation.PASS;
   }
 
   bool _didFailBecauseOfMissingXDisplay() {
     // Browser case:
     // If the browser test failed, it may have been because content shell
     // and the virtual framebuffer X server didn't hook up, or it crashed with
     // a core dump. Sometimes content shell crashes after it has set the stdout
     // to PASS, so we have to do this check first.
     var stderrLines = decodeUtf8(super.stderr).split("\n");
     for (String line in stderrLines) {
       // TODO(kustermann,ricow): Issue: 7564
       // This seems to happen quite frequently, we need to figure out why.
       if (line.contains(MESSAGE_CANNOT_OPEN_DISPLAY) ||
           line.contains(MESSAGE_FAILED_TO_RUN_COMMAND)) {
         return true;
       }
     }
     return false;
   }
 
   bool get _rendererCrashed =>
       decodeUtf8(super.stdout).contains("#CRASHED - rendere");
 
-  bool get _failedBecauseOfUnexpectedDRTOutput {
-    /*
-     * The output of content shell is different for pixel tests than for
-     * layout tests.
-     *
-     * On a pixel test, the DRT output has the following format
-     *     ......
-     *     ......
-     *     Content-Length: ...\n
-     *     <*png data>
-     *     #EOF\n
-     * So we need to get the byte-range of the png data first, before
-     * comparing it with the content of the expected output file.
-     *
-     * On a layout tests, the DRT output is directly compared with the
-     * content of the expected output.
-     */
-    var file = new io.File(command.expectedOutputFile.toNativePath());
-    if (file.existsSync()) {
-      var bytesContentLength = "Content-Length:".codeUnits;
-      var bytesNewLine = "\n".codeUnits;
-      var bytesEOF = "#EOF\n".codeUnits;
-
-      var expectedContent = file.readAsBytesSync();
-      if (command.isPixelTest) {
-        var startOfContentLength = findBytes(stdout, bytesContentLength);
-        if (startOfContentLength >= 0) {
-          var newLineAfterContentLength = findBytes(stdout,
-                                                    bytesNewLine,
-                                                    startOfContentLength);
-          if (newLineAfterContentLength > 0) {
-            var startPosition = newLineAfterContentLength +
-                bytesNewLine.length;
-            var endPosition = stdout.length - bytesEOF.length;
-
-            return !areByteArraysEqual(expectedContent,
-                                       0,
-                                       stdout,
-                                       startPosition,
-                                       endPosition - startPosition);
-          }
-        }
-        return true;
-      } else {
-        return !areByteArraysEqual(expectedContent, 0,
-                                   stdout, 0,
-                                   stdout.length);
-      }
-    }
-    return true;
-  }
-
   bool get _browserTestFailure {
     // Browser tests fail unless stdout contains
     // 'Content-Type: text/plain' followed by 'PASS'.
     bool hasContentType = false;
     var stdoutLines = decodeUtf8(super.stdout).split("\n");
     var containsFail = false;
     var containsPass = false;
     for (String line in stdoutLines) {
       switch (line) {
         case 'Content-Type: text/plain':
@@ skipping 1475 matching lines @@
     }
   }
 
   void eventAllTestsDone() {
     for (var listener in _eventListener) {
       listener.allDone();
     }
     _allDone();
   }
 }