Title: [194146] trunk/Tools
- Revision
- 194146
- Author
- [email protected]
- Date
- 2015-12-16 09:34:34 -0800 (Wed, 16 Dec 2015)
Log Message
Enforce temporarily bots to sync WebKit and WPT testharness.js
https://bugs.webkit.org/show_bug.cgi?id=152334
Reviewed by Darin Adler.
* Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py:
(WebPlatformTestServer._copy_webkit_test_files): Temporarily overwrite wpt testharness.js with WebKit testharness.js.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (194145 => 194146)
--- trunk/Tools/ChangeLog 2015-12-16 17:32:47 UTC (rev 194145)
+++ trunk/Tools/ChangeLog 2015-12-16 17:34:34 UTC (rev 194146)
@@ -1,5 +1,15 @@
2015-12-16 Youenn Fablet <[email protected]>
+ Enforce temporarily bots to sync WebKit and WPT testharness.js
+ https://bugs.webkit.org/show_bug.cgi?id=152334
+
+ Reviewed by Darin Adler.
+
+ * Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py:
+ (WebPlatformTestServer._copy_webkit_test_files): Temporarily overwrite wpt testharness.js with WebKit testharness.js.
+
+2015-12-16 Youenn Fablet <[email protected]>
+
[Fetch API] Add fetch API compile time flag
https://bugs.webkit.org/show_bug.cgi?id=152254
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py (194145 => 194146)
--- trunk/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py 2015-12-16 17:32:47 UTC (rev 194145)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py 2015-12-16 17:34:34 UTC (rev 194146)
@@ -101,6 +101,8 @@
wpt_testharnessjs_file = self._filesystem.join(self._doc_root, "resources", "testharness.js")
layout_tests_testharnessjs_file = self._filesystem.join(self._layout_root, "resources", "testharness.js")
+ # FIXME: Next line to be removed once all bots have wpt_testharnessjs_file updated correctly. See https://bugs.webkit.org/show_bug.cgi?id=152257.
+ self._filesystem.copyfile(layout_tests_testharnessjs_file, wpt_testharnessjs_file)
if (not self._filesystem.compare(wpt_testharnessjs_file, layout_tests_testharnessjs_file)):
_log.warning("\n//////////\nWPT tests are not using the same testharness.js file as other WebKit Layout tests.\nWebKit testharness.js might need to be updated according WPT testharness.js.\n//////////\n")
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
