Include console.log output in exceptions thrown for WebGL test failures.

content/test/gpu/gpu_tests/webgl_conformance.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 import json
 import os
 import sys
 
 import webgl_conformance_expectations
 
 from telemetry import test as test_module
 from telemetry.core import util
 from telemetry.page import page_set
 from telemetry.page import page_test
 
 conformance_path = os.path.join(
     util.GetChromiumSrcDir(), 'third_party', 'webgl_conformance')
 
 conformance_harness_script = r"""
   var testHarness = {};
   testHarness._allTestSucceeded = true;
   testHarness._messages = '';
   testHarness._failures = 0;
   testHarness._finished = false;
+  testHarness._originalLog = window.console.log;
+
+  testHarness.log = function(msg) {
+    testHarness._messages += msg + "\n";
+    testHarness._originalLog.apply(window.console, [msg]);
+  }
 
   testHarness.reportResults = function(success, msg) {
     testHarness._allTestSucceeded = testHarness._allTestSucceeded && !!success;
     if(!success) {
       testHarness._failures++;
       if(msg) {
-        testHarness._messages += msg + "\n";
+        testHarness.log(msg);
       }
     }
   };
   testHarness.notifyFinished = function() {
     testHarness._finished = true;
   };
   testHarness.navigateToPage = function(src) {
     var testFrame = document.getElementById("test-frame");
     testFrame.src = src;
   };
 
   window.webglTestHarness = testHarness;
   window.parent.webglTestHarness = testHarness;
   console.log("Harness injected.");
+  window.console.log = testHarness.log;
 """
 
 def _DidWebGLTestSucceed(tab):
   return tab.EvaluateJavaScript('webglTestHarness._allTestSucceeded')
 
 def _WebGLTestMessages(tab):
   return tab.EvaluateJavaScript('webglTestHarness._messages')
 
 class WebglConformanceValidator(page_test.PageTest):
   def __init__(self):
@@ skipping 82 matching lines @@
 
         if '.txt' in test_name:
           include_path = os.path.join(current_dir, test_name)
           test_paths += WebglConformance._ParseTests(
             include_path, version)
         else:
           test = os.path.join(current_dir, test_name)
           test_paths.append(test)
 
     return test_paths