Attachment 371921 Details for Bug 198780 – Patch

[patch] Patch

bug-198780-20190611212908.patch (text/plain), 1.52 KB, created by youenn fablet on 2019-06-11 21:29:09 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: youenn fablet

Created: 2019-06-11 21:29:09 PDT

Size: 1.52 KB

patch

obsolete

>Subversion Revision: 246170
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 9cc1ee62709ded2d46853c73e88d93aed43e29d9..b269b58fa7f16ea522805a2e3df429be3c9e3c9f 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-06-11  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 NOBODY (OOPS!).
>+
>+        * 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-11  Youenn Fablet  <youenn@apple.com>
> 
>         import-w3c-tests should respect WEBKIT_OUTPUTDIR
>diff --git a/Tools/Scripts/webkitpy/w3c/test_importer.py b/Tools/Scripts/webkitpy/w3c/test_importer.py
>index 8ee562853745948594c30bafeb818561c391b5ae..2e4597284146c46b7cae7af2790687986c473303 100644
>--- a/Tools/Scripts/webkitpy/w3c/test_importer.py
>+++ b/Tools/Scripts/webkitpy/w3c/test_importer.py
>@@ -365,7 +365,12 @@ class TestImporter(object):
>             return ''
> 
>         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 ''
>         first_line = contents[0]

Actions: View | Formatted Diff | Diff

Attachments on bug 198780: 371921