Use dumpJSConsoleLogInStdErr=true webkit-test-runner option for non-imported tests...
authorHironori.Fujii@sony.com <Hironori.Fujii@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 18 Feb 2019 02:15:37 +0000 (02:15 +0000)
committerHironori.Fujii@sony.com <Hironori.Fujii@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 18 Feb 2019 02:15:37 +0000 (02:15 +0000)
https://bugs.webkit.org/show_bug.cgi?id=194586

Reviewed by Ross Kirsling.

Tools:

* 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.

LayoutTests:

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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@241656 268f45cc-cd09-0410-ab3c-d52691b4dbfc

19 files changed:
LayoutTests/ChangeLog
LayoutTests/TestExpectations
LayoutTests/http/tests/appcache/404-resource-with-slow-main-resource.php
LayoutTests/http/tests/appcache/deferred-events-delete-while-raising-timer.html
LayoutTests/http/tests/appcache/deferred-events-delete-while-raising.html
LayoutTests/http/tests/appcache/fail-on-update-2.html
LayoutTests/http/tests/appcache/fail-on-update.html
LayoutTests/http/tests/cache/disk-cache/redirect-chain-limits.html
LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-main-frame.html
LayoutTests/http/tests/security/cross-origin-cached-images-parallel.html
LayoutTests/http/tests/security/frame-loading-via-document-write-async-delegates.html
LayoutTests/http/tests/security/frame-loading-via-document-write.html
LayoutTests/http/tests/xmlhttprequest/redirect-cross-origin-sync-double.html
LayoutTests/http/wpt/beacon/cors/cors-redirect-failure.html
LayoutTests/http/wpt/html/browsers/history/the-location-interface/location-protocol-setter-non-broken-async-delegate.html
LayoutTests/media/event-queue-crash.html
Tools/ChangeLog
Tools/DumpRenderTree/win/DumpRenderTree.cpp
Tools/Scripts/webkitpy/port/driver.py

index b27809a..aff6228 100644 (file)
@@ -1,3 +1,31 @@
+2019-02-17  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 Ross Kirsling.
+
+        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-17  Matt Baker  <mattbaker@apple.com>
 
         Web Inspector: Frontend performance is very slow reloading theverge.com - 50% of time in TreeOutline _indexOfTreeElement
index 90e5118..c2c19fb 100644 (file)
@@ -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 ]
 
index c2a4ea1..e551780 100644 (file)
@@ -1,3 +1,4 @@
+<!-- webkit-test-runner [ dumpJSConsoleLogInStdErr=true ] -->
 <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>
index c61f427..56ee491 100644 (file)
@@ -1,3 +1,4 @@
+<!-- webkit-test-runner [ dumpJSConsoleLogInStdErr=true ] -->
 <html manifest="THIS_FILE_DOES_NOT_EXIST.manifest">
 <head>
   <script src="THIS_FILE_DOES_NOT_EXIST.js" type="text/javascript"></script>
index fc4e0bc..4550d9a 100644 (file)
@@ -1,3 +1,4 @@
+<!-- webkit-test-runner [ dumpJSConsoleLogInStdErr=true ] -->
 <html manifest="resources/fail-on-update-2.php">
 <script>
 if (window.testRunner) {
index 94ffca3..7487da6 100644 (file)
@@ -1,3 +1,4 @@
+<!-- webkit-test-runner [ dumpJSConsoleLogInStdErr=true ] -->
 <html manifest="resources/fail-on-update.php">
 <script>
 if (window.testRunner) {
index a02b4b5..7574100 100644 (file)
@@ -1,3 +1,4 @@
+<!-- webkit-test-runner [ dumpJSConsoleLogInStdErr=true ] -->
 <script src="/js-test-resources/js-test-pre.js"></script>
 <script>
 window.jsTestIsAsync = true;
index 8690563..662fa2d 100644 (file)
@@ -1,3 +1,4 @@
+<!-- webkit-test-runner [ dumpJSConsoleLogInStdErr=true ] -->
 <html>
 <body>
 <p>Tests source origin difference for cached resources.</p
index ff7653c..46e9904 100644 (file)
@@ -1,3 +1,4 @@
+<!-- webkit-test-runner [ dumpJSConsoleLogInStdErr=true ] -->
 <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>
index 08f2132..e37563c 100644 (file)
@@ -1,4 +1,4 @@
-<!doctype html>
+<!doctype html><!-- webkit-test-runner [ dumpJSConsoleLogInStdErr=true ] -->
 <html>
   <head>
     <meta charset="utf-8">
index 7ca0f96..0d5fb83 100644 (file)
@@ -1,4 +1,4 @@
-<!doctype html>
+<!doctype html><!-- webkit-test-runner [ dumpJSConsoleLogInStdErr=true ] -->
 <title>Set location.protocol to a non-broken-non-functioning scheme</title>
 <!-- In particular, valid non-broken schemes that are nevertheless not going to work -->
 <script src=/resources/testharness.js></script>
index 1e31f7c..ef543f8 100644 (file)
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html><!-- webkit-test-runner [ dumpJSConsoleLogInStdErr=true ] -->
 <html>
 <script src="media-file.js"></script>
         
index d9179aa..f8cc134 100644 (file)
@@ -1,3 +1,15 @@
+2019-02-17  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 Ross Kirsling.
+
+        * 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-17  David Kilzer  <ddkilzer@apple.com>
 
         Unreviewed, rolling out r241620.
index 3764fcd..dae5de7 100644 (file)
@@ -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;
index 11e8015..195a78a 100644 (file)
@@ -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':