Title: [194137] trunk/Tools
- Revision
- 194137
- Author
- [email protected]
- Date
- 2015-12-16 01:18:00 -0800 (Wed, 16 Dec 2015)
Log Message
Remove default copy of wpt testharness.js when launching wpt server
https://bugs.webkit.org/show_bug.cgi?id=152298
Reviewed by Darin Adler.
* Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py:
(WebPlatformTestServer._copy_webkit_test_files): Deleted default copy of WebKit testharness.js to WPT.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (194136 => 194137)
--- trunk/Tools/ChangeLog 2015-12-16 09:16:29 UTC (rev 194136)
+++ trunk/Tools/ChangeLog 2015-12-16 09:18:00 UTC (rev 194137)
@@ -1,3 +1,13 @@
+2015-12-16 Youenn Fablet <[email protected]>
+
+ Remove default copy of wpt testharness.js when launching wpt server
+ https://bugs.webkit.org/show_bug.cgi?id=152298
+
+ Reviewed by Darin Adler.
+
+ * Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py:
+ (WebPlatformTestServer._copy_webkit_test_files): Deleted default copy of WebKit testharness.js to WPT.
+
2015-12-15 David Kilzer <[email protected]>
REGRESSION (r192375): DumpRenderTree.app exits immediately with no error
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py (194136 => 194137)
--- trunk/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py 2015-12-16 09:16:29 UTC (rev 194136)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py 2015-12-16 09:18:00 UTC (rev 194137)
@@ -101,9 +101,6 @@
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 two lines are a temp hack for this patch to land smoothly on bots. They should be removed once patch landed and each bot runs these lines once.
- if (not self._filesystem.isfile(wpt_testharnessjs_file)):
- 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
