Changeset 246469 in webkit

Timestamp:

Jun 15, 2019, 9:46:16 PM (7 years ago)

Author:

youenn@apple.com

Message:

WPT test importer WTR option reader should not throw if the file is not proper UTF-8
​https://bugs.webkit.org/show_bug.cgi?id=198780

Reviewed by Jonathan Bedard.

• Scripts/webkitpy/w3c/test_importer.py:

(TestImporter._webkit_test_runner_options):
In case the test file cannot be read as text, consider that there is no WTR option.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/w3c/test_importer.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-06-15  Youenn Fablet  <youenn@apple.com>
+
+        WPT test importer WTR option reader should not throw if the file is not proper UTF-8
+        https://bugs.webkit.org/show_bug.cgi?id=198780
+
+        Reviewed by Jonathan Bedard.
+
+        * Scripts/webkitpy/w3c/test_importer.py:
+        (TestImporter._webkit_test_runner_options):
+        In case the test file cannot be read as text, consider that there is no WTR option.
+
 2019-06-14  Youenn Fablet  <youenn@apple.com>
 

trunk/Tools/Scripts/webkitpy/w3c/test_importer.py

@@ -366 +366 @@
 
         options_prefix = '<!-- webkit-test-runner'
-        contents = self.filesystem.read_text_file(path).split('\n')
+        contents = ''
+        try:
+            contents = self.filesystem.read_text_file(path).split('\n')
+        except:
+            _log.info('unable to read %s as a text file' % path)
+
         if not len(contents):
             return ''