Modified: trunk/LayoutTests/ChangeLog (208979 => 208980)
--- trunk/LayoutTests/ChangeLog 2016-11-26 23:21:39 UTC (rev 208979)
+++ trunk/LayoutTests/ChangeLog 2016-11-26 23:35:11 UTC (rev 208980)
@@ -1,3 +1,12 @@
+2016-11-26 Simon Fraser <[email protected]>
+
+ Convert testharnessreport.js to LF linebreaks, from CRLF, which broke patches.
+
+ * resources/testharnessreport.js:
+ (convertResult):
+ (self.testRunner.add_completion_callback.):
+ (self.testRunner.add_completion_callback):
+
2016-11-25 Myles C. Maxfield <[email protected]>
[CSS Font Loading] FontFace.load() promises don't always fire
Modified: trunk/LayoutTests/resources/testharnessreport.js (208979 => 208980)
--- trunk/LayoutTests/resources/testharnessreport.js 2016-11-26 23:21:39 UTC (rev 208979)
+++ trunk/LayoutTests/resources/testharnessreport.js 2016-11-26 23:35:11 UTC (rev 208980)
@@ -1,95 +1,95 @@
-/*
- * This file is intended for vendors to implement
- * code needed to integrate testharness.js tests with their own test systems.
- *
- * Typically such integration will attach callbacks when each test is
- * has run, using add_result_callback(callback(test)), or when the whole test file has
- * completed, using add_completion_callback(callback(tests, harness_status)).
- *
- * For more documentation about the callback functions and the
- * parameters they are called with see testharness.js
- */
-
-// Setup for WebKit _javascript_ tests
-if (self.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
- testRunner.setCanOpenWindows();
- // Let's restrict calling testharness timeout() to wptserve tests for the moment.
- // That will limit the impact to a small number of tests.
- // The risk is that testharness timeout() might be called to late on slow bots to finish properly.
- if (testRunner.timeout && location.port == 8800)
- setTimeout(timeout, testRunner.timeout * 0.9);
-}
-
-// Function used to convert the test status code into
-// the corresponding string
-function convertResult(resultStatus)
-{
- if(resultStatus == 0)
- return("PASS");
- else if(resultStatus == 1)
- return("FAIL");
- else if(resultStatus == 2)
- return("TIMEOUT");
- else
- return("NOTRUN");
-}
-
-if (self.testRunner) {
- /* Disable the default output of testharness.js. The default output formats
- * test results into an HTML table. When that table is dumped as text, no
- * spacing between cells is preserved, and it is therefore not readable. By
- * setting output to false, the HTML table will not be created
- */
- setup({"output": false, "explicit_timeout": true});
-
- /* Using a callback function, test results will be added to the page in a
- * manner that allows dumpAsText to produce readable test results
- */
- add_completion_callback(function (tests, harness_status) {
- // Wait for any other completion callbacks
- setTimeout(function() {
- var results = document.createElement("pre");
- var resultStr = "\n";
-
- // Sanitizes the given text for display in test results.
- function sanitize(text) {
- if (!text) {
- return "";
- }
- text = text.replace(/\0/g, "\\0");
- return text.replace(/\r/g, "\\r");
- }
-
- if(harness_status.status != 0)
- resultStr += "Harness Error (" + convertResult(harness_status.status) + "), message = " + harness_status.message + "\n\n";
-
- for (var i = 0; i < tests.length; i++) {
- var message = sanitize(tests[i].message);
- if (tests[i].status == 1 && !tests[i].dumpStack) {
- // Remove stack for failed tests for proper string comparison without file paths.
- // For a test to dump the stack set its dumpStack attribute to true.
- var stackIndex = message.indexOf("(stack:");
- if (stackIndex > 0)
- message = message.substr(0, stackIndex);
- }
- resultStr += convertResult(tests[i].status) + " " + sanitize(tests[i].name) + " " + message + "\n";
- }
-
- results.innerText = resultStr;
- var log = document.getElementById("log");
- if (log)
- log.appendChild(results);
- else
- document.body.appendChild(results);
-
- testRunner.notifyDone();
- }, 0);
- });
-
- if (window.internals) {
- internals.setResourceTimingSupport(true);
- internals.settings.setIntersectionObserverEnabled(true);
- }
-}
+/*
+ * This file is intended for vendors to implement
+ * code needed to integrate testharness.js tests with their own test systems.
+ *
+ * Typically such integration will attach callbacks when each test is
+ * has run, using add_result_callback(callback(test)), or when the whole test file has
+ * completed, using add_completion_callback(callback(tests, harness_status)).
+ *
+ * For more documentation about the callback functions and the
+ * parameters they are called with see testharness.js
+ */
+
+// Setup for WebKit _javascript_ tests
+if (self.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ testRunner.setCanOpenWindows();
+ // Let's restrict calling testharness timeout() to wptserve tests for the moment.
+ // That will limit the impact to a small number of tests.
+ // The risk is that testharness timeout() might be called to late on slow bots to finish properly.
+ if (testRunner.timeout && location.port == 8800)
+ setTimeout(timeout, testRunner.timeout * 0.9);
+}
+
+// Function used to convert the test status code into
+// the corresponding string
+function convertResult(resultStatus)
+{
+ if(resultStatus == 0)
+ return("PASS");
+ else if(resultStatus == 1)
+ return("FAIL");
+ else if(resultStatus == 2)
+ return("TIMEOUT");
+ else
+ return("NOTRUN");
+}
+
+if (self.testRunner) {
+ /* Disable the default output of testharness.js. The default output formats
+ * test results into an HTML table. When that table is dumped as text, no
+ * spacing between cells is preserved, and it is therefore not readable. By
+ * setting output to false, the HTML table will not be created
+ */
+ setup({"output": false, "explicit_timeout": true});
+
+ /* Using a callback function, test results will be added to the page in a
+ * manner that allows dumpAsText to produce readable test results
+ */
+ add_completion_callback(function (tests, harness_status) {
+ // Wait for any other completion callbacks
+ setTimeout(function() {
+ var results = document.createElement("pre");
+ var resultStr = "\n";
+
+ // Sanitizes the given text for display in test results.
+ function sanitize(text) {
+ if (!text) {
+ return "";
+ }
+ text = text.replace(/\0/g, "\\0");
+ return text.replace(/\r/g, "\\r");
+ }
+
+ if(harness_status.status != 0)
+ resultStr += "Harness Error (" + convertResult(harness_status.status) + "), message = " + harness_status.message + "\n\n";
+
+ for (var i = 0; i < tests.length; i++) {
+ var message = sanitize(tests[i].message);
+ if (tests[i].status == 1 && !tests[i].dumpStack) {
+ // Remove stack for failed tests for proper string comparison without file paths.
+ // For a test to dump the stack set its dumpStack attribute to true.
+ var stackIndex = message.indexOf("(stack:");
+ if (stackIndex > 0)
+ message = message.substr(0, stackIndex);
+ }
+ resultStr += convertResult(tests[i].status) + " " + sanitize(tests[i].name) + " " + message + "\n";
+ }
+
+ results.innerText = resultStr;
+ var log = document.getElementById("log");
+ if (log)
+ log.appendChild(results);
+ else
+ document.body.appendChild(results);
+
+ testRunner.notifyDone();
+ }, 0);
+ });
+
+ if (window.internals) {
+ internals.setResourceTimingSupport(true);
+ internals.settings.setIntersectionObserverEnabled(true);
+ }
+}
