Remove default copy of wpt testharness.js when launching wpt server
authoryouenn.fablet@crf.canon.fr <youenn.fablet@crf.canon.fr@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 16 Dec 2015 09:18:00 +0000 (09:18 +0000)
committeryouenn.fablet@crf.canon.fr <youenn.fablet@crf.canon.fr@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 16 Dec 2015 09:18:00 +0000 (09:18 +0000)
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.

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

Tools/ChangeLog
Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py

index 41e9a87..60c34a1 100644 (file)
@@ -1,3 +1,13 @@
+2015-12-16  Youenn Fablet  <youenn.fablet@crf.canon.fr>
+
+        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  <ddkilzer@apple.com>
 
         REGRESSION (r192375): DumpRenderTree.app exits immediately with no error
index 9e2547b..2df779f 100755 (executable)
@@ -101,9 +101,6 @@ class WebPlatformTestServer(http_server_base.HttpServerBase):
 
         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")