Attachment 361997 Details for Bug 194586 – Patch

[patch] Patch

bug-194586-20190214163149.patch (text/plain), 17.93 KB, created by Fujii Hironori on 2019-02-13 23:31:50 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2019-02-13 23:31:50 PST

Size: 17.93 KB

patch

obsolete

>Subversion Revision: 241493
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 9ea8acc366d0598d4174b05652fa23f120ae78e7..8aa0d0e87b1e032dd83e36e06dacc6a2a2fa0fe6 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-02-13  Fujii Hironori  <Hironori.Fujii@sony.com>
>+
>+        Use dumpJSConsoleLogInStdErr=true webkit-test-runner option for non-imported tests instead of using DumpJSConsoleLogInStdErr expectation in TestExpectations
>+        https://bugs.webkit.org/show_bug.cgi?id=194586
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * DumpRenderTree/win/DumpRenderTree.cpp:
>+        (runTest): Pass true to setDumpJSConsoleLogInStdErr if options.dumpJSConsoleLogInStdErr is true.
>+        * Scripts/webkitpy/port/driver.py:
>+        (Driver._command_from_driver_input): Convert Cygwin absolute path of tests to Windows path.
>+
> 2019-02-13  Aakash Jain  <aakash_jain@apple.com>
> 
>         [ews-app] Change log level for a log statement
>diff --git a/Tools/DumpRenderTree/win/DumpRenderTree.cpp b/Tools/DumpRenderTree/win/DumpRenderTree.cpp
>index a0b685c75f9daf0feb7eaae1bb32a2e952d226f4..c06402e859cc614c5a15f64897eecee08005a994 100644
>--- a/Tools/DumpRenderTree/win/DumpRenderTree.cpp
>+++ b/Tools/DumpRenderTree/win/DumpRenderTree.cpp
>@@ -1173,7 +1173,7 @@ static void runTest(const string& inputLine)
> 
>     ::gTestRunner = TestRunner::create(testURL.data(), command.expectedPixelHash);
>     ::gTestRunner->setCustomTimeout(command.timeout);
>-    ::gTestRunner->setDumpJSConsoleLogInStdErr(command.dumpJSConsoleLogInStdErr);
>+    ::gTestRunner->setDumpJSConsoleLogInStdErr(command.dumpJSConsoleLogInStdErr || options.dumpJSConsoleLogInStdErr);
> 
>     topLoadingFrame = nullptr;
>     done = false;
>diff --git a/Tools/Scripts/webkitpy/port/driver.py b/Tools/Scripts/webkitpy/port/driver.py
>index 11e8015a9a153a9e053ae2d9a360af7cfa671f36..195a78ad82daba8916cf27b81527e0d3a7757f01 100644
>--- a/Tools/Scripts/webkitpy/port/driver.py
>+++ b/Tools/Scripts/webkitpy/port/driver.py
>@@ -545,7 +545,10 @@ class Driver(object):
>         elif self.is_web_platform_test(driver_input.test_name) or self.is_webkit_specific_web_platform_test(driver_input.test_name) or self.is_http_test(driver_input.test_name):
>             command = self.test_to_uri(driver_input.test_name)
>             command += "'--absolutePath'"
>-            command += self._port.abspath_for_test(driver_input.test_name, self._target_host)
>+            absPath = self._port.abspath_for_test(driver_input.test_name, self._target_host)
>+            if sys.platform == 'cygwin':
>+                absPath = path.cygpath(absPath)
>+            command += absPath
>         else:
>             command = self._port.abspath_for_test(driver_input.test_name, self._target_host)
>             if sys.platform == 'cygwin':
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 0a39a4faa7007a5ad22b62a138fedf215adf733e..2a753560abf475eac46e1870b746d8ae94575f80 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,31 @@
>+2019-02-13  Fujii Hironori  <Hironori.Fujii@sony.com>
>+
>+        Use dumpJSConsoleLogInStdErr=true webkit-test-runner option for non-imported tests instead of using DumpJSConsoleLogInStdErr expectation in TestExpectations
>+        https://bugs.webkit.org/show_bug.cgi?id=194586
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        DumpJSConsoleLogInStdErr expectation is considered a bad idea.
>+        And, we have dumpJSConsoleLogInStdErr test option now (Bug 177027).
>+
>+        Added dumpJSConsoleLogInStdErr=true webkit-test-runner option to all non-imported tests.
>+
>+        * TestExpectations: Removed DumpJSConsoleLogInStdErr expectations of non-imported tests.
>+        * http/tests/appcache/404-resource-with-slow-main-resource.php: Added dumpJSConsoleLogInStdErr=true webkit-test-runner option.
>+        * http/tests/appcache/deferred-events-delete-while-raising-timer.html: Ditto.
>+        * http/tests/appcache/deferred-events-delete-while-raising.html: Ditto.
>+        * http/tests/appcache/fail-on-update-2.html: Ditto.
>+        * http/tests/appcache/fail-on-update.html: Ditto.
>+        * http/tests/cache/disk-cache/redirect-chain-limits.html: Ditto.
>+        * http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-main-frame.html: Ditto.
>+        * http/tests/security/cross-origin-cached-images-parallel.html: Ditto.
>+        * http/tests/security/frame-loading-via-document-write-async-delegates.html: Ditto.
>+        * http/tests/security/frame-loading-via-document-write.html: Ditto.
>+        * http/tests/xmlhttprequest/redirect-cross-origin-sync-double.html: Ditto.
>+        * http/wpt/beacon/cors/cors-redirect-failure.html: Ditto.
>+        * http/wpt/html/browsers/history/the-location-interface/location-protocol-setter-non-broken-async-delegate.html: Ditto.
>+        * media/event-queue-crash.html: Ditto.
>+
> 2019-02-13  Alicia Boya GarcÃa  <aboya@igalia.com>
> 
>         Unreviewed GTK test gardening
>diff --git a/LayoutTests/TestExpectations b/LayoutTests/TestExpectations
>index 90e51188c606647f6c958ad537a1a532e1bf004d..c2c19fb1153ea659530df86108bd5fff7d9cb26a 100644
>--- a/LayoutTests/TestExpectations
>+++ b/LayoutTests/TestExpectations
>@@ -256,10 +256,6 @@ imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/loc
> imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/location_assign.html [ Skip ]
> imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/per-global.window.html [ Skip ]
> 
>-# Line number in the console logging may change so we silence it to avoid flakiness.
>-http/tests/security/frame-loading-via-document-write.html [ DumpJSConsoleLogInStdErr ]
>-http/tests/security/frame-loading-via-document-write-async-delegates.html [ DumpJSConsoleLogInStdErr ]
>-
> imported/w3c/web-platform-tests/fetch/api/basic/mode-same-origin.any.html [ DumpJSConsoleLogInStdErr ]
> imported/w3c/web-platform-tests/fetch/api/basic/scheme-about.any.html [ DumpJSConsoleLogInStdErr ]
> imported/w3c/web-platform-tests/fetch/api/basic/scheme-about.any.worker.html [ DumpJSConsoleLogInStdErr ]
>@@ -318,7 +314,6 @@ imported/w3c/web-platform-tests/xhr/send-authentication-basic-setrequestheader-e
> imported/w3c/web-platform-tests/xhr/send-authentication-competing-names-passwords.htm [ Failure ]
> imported/w3c/web-platform-tests/xhr/preserve-ua-header-on-redirect.htm [ Failure ]
> imported/w3c/web-platform-tests/xhr/setrequestheader-case-insensitive.htm [ Failure ]
>-http/tests/security/cross-origin-cached-images-parallel.html [ DumpJSConsoleLogInStdErr ]
> 
> # textarea.animate is not supported
> imported/w3c/web-platform-tests/css/css-ui/caret-color-018.html [ Skip ]
>@@ -339,7 +334,6 @@ http/tests/paymentrequest [ Skip ]
> http/tests/inspector/paymentrequest [ Skip ]
> imported/w3c/web-platform-tests/payment-request [ Skip ]
> 
>-http/tests/xmlhttprequest/redirect-cross-origin-sync-double.html [ DumpJSConsoleLogInStdErr ]
> imported/w3c/web-platform-tests/xhr/send-redirect-bogus-sync.htm [ DumpJSConsoleLogInStdErr ]
> 
> imported/w3c/web-platform-tests/xhr/xmlhttprequest-sync-default-feature-policy.sub.html [ Skip ]
>@@ -414,9 +408,6 @@ webkit.org/b/179881 imported/w3c/web-platform-tests/encoding/eof-shift_jis.html
> # Tests in this directory take > 30 minutes to run on debug bots.
> [ Debug ] imported/w3c/web-platform-tests/encoding
> 
>-# redirect-chain.php is generating some random number that appear in console error logging.
>-http/tests/cache/disk-cache/redirect-chain-limits.html [ DumpJSConsoleLogInStdErr ]
>-
> # Content encoding sniffing is only supported by CFNetwork.
> http/tests/xmlhttprequest/gzip-content-type-no-content-encoding.html [ Skip ]
> 
>@@ -1178,12 +1169,6 @@ webkit.org/b/140043 js/dom/Promise.html [ Pass Failure ]
> webkit.org/b/134550 http/tests/cache/iframe-304-crash.html [ Failure Pass ]
> webkit.org/b/141267 http/tests/misc/detached-frame-console.html [ Pass Failure ]
> 
>-http/tests/appcache/deferred-events-delete-while-raising-timer.html [ DumpJSConsoleLogInStdErr ]
>-http/tests/appcache/deferred-events-delete-while-raising.html [ DumpJSConsoleLogInStdErr ]
>-http/tests/appcache/fail-on-update.html [ DumpJSConsoleLogInStdErr ]
>-http/tests/appcache/fail-on-update-2.html [ DumpJSConsoleLogInStdErr ]
>-http/tests/appcache/404-resource-with-slow-main-resource.php [ DumpJSConsoleLogInStdErr ]
>-
> webkit.org/b/141370 http/tests/security/appcache-in-private-browsing.html [ Pass Failure ]
> 
> # The current expectations for this test only make sense for WebKit on iOS; other platforms can have very different behaviors.
>@@ -1197,8 +1182,6 @@ http/tests/contentextensions [ Skip ]
> http/tests/websocket/tests/hybi/contentextensions [ Skip ]
> http/wpt/beacon/contentextensions [ Skip ]
> 
>-http/wpt/beacon/cors/cors-redirect-failure.html [ DumpJSConsoleLogInStdErr ]
>-
> webkit.org/b/149072 svg/animations/svgboolean-animation-1.html [ Pass Failure ]
> 
> webkit.org/b/143085 media/track/track-mode.html [ Pass Timeout ]
>@@ -2066,12 +2049,7 @@ webkit.org/b/178785 perf/object-keys.html [ Pass Failure ]
> # There is a bug in the test
> imported/w3c/web-platform-tests/workers/worker-performance.worker.html [ Pass Failure ]
> 
>-webkit.org/b/183390 http/wpt/html/browsers/history/the-location-interface/location-protocol-setter-non-broken-async-delegate.html [ DumpJSConsoleLogInStdErr Pass Failure ]
>-
>-# We sometimes get 2 console log messages about CSP instead of 1 due to preloading.
>-http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-main-frame.html [ DumpJSConsoleLogInStdErr ]
>-
>-media/event-queue-crash.html [ DumpJSConsoleLogInStdErr ]
>+webkit.org/b/183390 http/wpt/html/browsers/history/the-location-interface/location-protocol-setter-non-broken-async-delegate.html [ Pass Failure ]
> 
> webkit.org/b/172243 imported/w3c/web-platform-tests/IndexedDB/idbdatabase-createObjectStore-exception-order.htm [ Pass Failure ]
> 
>diff --git a/LayoutTests/http/tests/appcache/404-resource-with-slow-main-resource.php b/LayoutTests/http/tests/appcache/404-resource-with-slow-main-resource.php
>index c2a4ea192e2d2f70bb410772c9a04632905933b1..e551780df5fa6cfff2fd24fd395180b8c9832264 100644
>--- a/LayoutTests/http/tests/appcache/404-resource-with-slow-main-resource.php
>+++ b/LayoutTests/http/tests/appcache/404-resource-with-slow-main-resource.php
>@@ -1,3 +1,4 @@
>+
> <html manifest="resources/404-resource.manifest">
> <div>This tests that a manifest that contains a missing file will not crash the browser even if the main resource keeps loading after the error occurs.</div>
> <div id="result">FAILURE</div>
>diff --git a/LayoutTests/http/tests/appcache/deferred-events-delete-while-raising-timer.html b/LayoutTests/http/tests/appcache/deferred-events-delete-while-raising-timer.html
>index 0bdc710777f2be4c0efabec46883265e4324a6fb..adce18228d367ff29951e0c9f34b60f8e02023cd 100644
>--- a/LayoutTests/http/tests/appcache/deferred-events-delete-while-raising-timer.html
>+++ b/LayoutTests/http/tests/appcache/deferred-events-delete-while-raising-timer.html
>@@ -1,3 +1,4 @@
>+
> <html>
> <script>
> if (window.testRunner) {
>diff --git a/LayoutTests/http/tests/appcache/deferred-events-delete-while-raising.html b/LayoutTests/http/tests/appcache/deferred-events-delete-while-raising.html
>index c61f427143c8e406d45175b4782ef10a9eb29f18..56ee491a4de52f288b2c2ffb51d79a3897110bf0 100644
>--- a/LayoutTests/http/tests/appcache/deferred-events-delete-while-raising.html
>+++ b/LayoutTests/http/tests/appcache/deferred-events-delete-while-raising.html
>@@ -1,3 +1,4 @@
>+
> <html manifest="THIS_FILE_DOES_NOT_EXIST.manifest">
> <head>
>   <script src="THIS_FILE_DOES_NOT_EXIST.js" type="text/javascript"></script>
>diff --git a/LayoutTests/http/tests/appcache/fail-on-update-2.html b/LayoutTests/http/tests/appcache/fail-on-update-2.html
>index fc4e0bc13f4f21c3661eee8eb29e1234cd056d67..4550d9a498e075c8ebfd54eddf369df9cdd5f9b0 100644
>--- a/LayoutTests/http/tests/appcache/fail-on-update-2.html
>+++ b/LayoutTests/http/tests/appcache/fail-on-update-2.html
>@@ -1,3 +1,4 @@
>+
> <html manifest="resources/fail-on-update-2.php">
> <script>
> if (window.testRunner) {
>diff --git a/LayoutTests/http/tests/appcache/fail-on-update.html b/LayoutTests/http/tests/appcache/fail-on-update.html
>index 94ffca3b9925d031bd8722347c5cbefe576c1d91..7487da684100fc09b3ff63947d45d9a69fc7ad2c 100644
>--- a/LayoutTests/http/tests/appcache/fail-on-update.html
>+++ b/LayoutTests/http/tests/appcache/fail-on-update.html
>@@ -1,3 +1,4 @@
>+
> <html manifest="resources/fail-on-update.php">
> <script>
> if (window.testRunner) {
>diff --git a/LayoutTests/http/tests/cache/disk-cache/redirect-chain-limits.html b/LayoutTests/http/tests/cache/disk-cache/redirect-chain-limits.html
>index a02b4b5fb6cf107c56ee0f3531f0c5a7e92539ee..75741002d180aeea6a6d16994eaa2acdb8db3def 100644
>--- a/LayoutTests/http/tests/cache/disk-cache/redirect-chain-limits.html
>+++ b/LayoutTests/http/tests/cache/disk-cache/redirect-chain-limits.html
>@@ -1,3 +1,4 @@
>+
> <script src="/js-test-resources/js-test-pre.js"></script>
> <script>
> window.jsTestIsAsync = true;
>diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-main-frame.html b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-main-frame.html
>index eaef2ec0e8ee37fcdc37309bd1b2f4fc785766aa..1cf8ce82905d4788bb5cf582b0a92c569da8d457 100644
>--- a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-main-frame.html
>+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-main-frame.html
>@@ -1,4 +1,4 @@
>-<!DOCTYPE html>
>+<!DOCTYPE html>
> <html>
> <head>
> <script>
>diff --git a/LayoutTests/http/tests/security/cross-origin-cached-images-parallel.html b/LayoutTests/http/tests/security/cross-origin-cached-images-parallel.html
>index 8690563358d0af61618222cfb9312810e4acd932..662fa2d44d58cb5ea1907cd3abe25fd48a6b74d6 100644
>--- a/LayoutTests/http/tests/security/cross-origin-cached-images-parallel.html
>+++ b/LayoutTests/http/tests/security/cross-origin-cached-images-parallel.html
>@@ -1,3 +1,4 @@
>+
> <html>
> <body>
> <p>Tests source origin difference for cached resources.</p
>diff --git a/LayoutTests/http/tests/security/frame-loading-via-document-write-async-delegates.html b/LayoutTests/http/tests/security/frame-loading-via-document-write-async-delegates.html
>index c5989b99590c7f7525e8f75c13115c9dc22299c7..e8096658e61efa020880501b736670192714c206 100644
>--- a/LayoutTests/http/tests/security/frame-loading-via-document-write-async-delegates.html
>+++ b/LayoutTests/http/tests/security/frame-loading-via-document-write-async-delegates.html
>@@ -1,3 +1,4 @@
>+
> <html>
> <head>
> <title></title>
>diff --git a/LayoutTests/http/tests/security/frame-loading-via-document-write.html b/LayoutTests/http/tests/security/frame-loading-via-document-write.html
>index de684dfb43d1cadebcafe6bcb7655a42ecd57e27..d3d137cabec5d6a5f30fb45d226ca99c18bf2856 100644
>--- a/LayoutTests/http/tests/security/frame-loading-via-document-write.html
>+++ b/LayoutTests/http/tests/security/frame-loading-via-document-write.html
>@@ -1,3 +1,4 @@
>+
> <html>
> <head>
> <title></title>
>diff --git a/LayoutTests/http/tests/xmlhttprequest/redirect-cross-origin-sync-double.html b/LayoutTests/http/tests/xmlhttprequest/redirect-cross-origin-sync-double.html
>index ff7653c3f77bad47744c8627d75003d0ce578f56..46e990411f48c53fd46947d68b9cc2fd572f3f90 100644
>--- a/LayoutTests/http/tests/xmlhttprequest/redirect-cross-origin-sync-double.html
>+++ b/LayoutTests/http/tests/xmlhttprequest/redirect-cross-origin-sync-double.html
>@@ -1,3 +1,4 @@
>+
> <html>
> <body>
> <p>Test that a cross-origin chain of redirects to a server that responds is indistinguishable from one that does not. Should say PASS:</p>
>diff --git a/LayoutTests/http/wpt/beacon/cors/cors-redirect-failure.html b/LayoutTests/http/wpt/beacon/cors/cors-redirect-failure.html
>index 08f21325538bcc0d4abbddb2c415cfbd5bf5e348..e37563c6dfd6901a1c05af4313853d8277c2f533 100644
>--- a/LayoutTests/http/wpt/beacon/cors/cors-redirect-failure.html
>+++ b/LayoutTests/http/wpt/beacon/cors/cors-redirect-failure.html
>@@ -1,4 +1,4 @@
>-<!doctype html>
>+<!doctype html>
> <html>
>   <head>
>     <meta charset="utf-8">
>diff --git a/LayoutTests/http/wpt/html/browsers/history/the-location-interface/location-protocol-setter-non-broken-async-delegate.html b/LayoutTests/http/wpt/html/browsers/history/the-location-interface/location-protocol-setter-non-broken-async-delegate.html
>index 7ca0f9679229f545b9ab2657e090939b2233fb5a..0d5fb83d57755559b507baa6fe5ef88b5ef28563 100644
>--- a/LayoutTests/http/wpt/html/browsers/history/the-location-interface/location-protocol-setter-non-broken-async-delegate.html
>+++ b/LayoutTests/http/wpt/html/browsers/history/the-location-interface/location-protocol-setter-non-broken-async-delegate.html
>@@ -1,4 +1,4 @@
>-<!doctype html>
>+<!doctype html>
> <title>Set location.protocol to a non-broken-non-functioning scheme</title>
> 
> <script src=/resources/testharness.js></script>
>diff --git a/LayoutTests/media/event-queue-crash.html b/LayoutTests/media/event-queue-crash.html
>index 1e31f7c206f8438559119593525afd1c37f8fa7c..ef543f8b6f2ceb7e96e8c661261ac1d05dbe75d7 100644
>--- a/LayoutTests/media/event-queue-crash.html
>+++ b/LayoutTests/media/event-queue-crash.html
>@@ -1,4 +1,4 @@
>-<!DOCTYPE html>
>+<!DOCTYPE html>
> <html>
> <script src="media-file.js"></script>
>

Flags:

ross.kirsling: review+
ews-watchlist: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 194586: 361905 | 361911 | 361979 | 361995 | 361997 | 362004