Changeset 194146 in webkit

Timestamp:

Dec 16, 2015 9:34:34 AM (8 years ago)

Author:

youenn.fablet@crf.canon.fr

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.

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>
+
+        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  <youenn.fablet@crf.canon.fr>
 

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 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")