Changeset 194137 in webkit

Timestamp:

Dec 16, 2015, 1:18:00 AM (10 years ago)

Author:

youenn.fablet@crf.canon.fr

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.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+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>
 

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

@@ -102 +102 @@
         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")