Changeset 177727 in webkit

Timestamp:

Dec 24, 2014 4:54:11 PM (9 years ago)

Author:

commit-queue@webkit.org

Message:

W3C test importer should have an option to disable testharness.js/testharnessreport.js link conversion
​https://bugs.webkit.org/show_bug.cgi?id=134763

Patch by Youenn Fablet <​youenn.fablet@crf.canon.fr> on 2014-12-24
Reviewed by Ryosuke Niwa.

Adding an option to disable test harness link conversion.

• Scripts/webkitpy/w3c/test_converter.py:

(convert_for_webkit):
(_W3CTestConverter.init):
(_W3CTestConverter.convert_attributes_if_needed):

• Scripts/webkitpy/w3c/test_importer.py:

(parse_args):
(TestImporter.import_tests):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/w3c/test_converter.py (modified) (4 diffs)
• Scripts/webkitpy/w3c/test_importer.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2014-12-24  Youenn Fablet  <youenn.fablet@crf.canon.fr>
+
+        W3C test importer should have an option to disable testharness.js/testharnessreport.js link conversion
+        https://bugs.webkit.org/show_bug.cgi?id=134763
+
+        Reviewed by Ryosuke Niwa.
+
+        Adding an option to disable test harness link conversion.
+
+        * Scripts/webkitpy/w3c/test_converter.py:
+        (convert_for_webkit):
+        (_W3CTestConverter.__init__):
+        (_W3CTestConverter.convert_attributes_if_needed):
+        * Scripts/webkitpy/w3c/test_importer.py:
+        (parse_args):
+        (TestImporter.import_tests):
+
 2014-12-23  Alexey Proskuryakov  <ap@apple.com>
 

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

@@ -38 +38 @@
 
 
-def convert_for_webkit(new_path, filename, reference_support_info, host=Host()):
+def convert_for_webkit(new_path, filename, reference_support_info, host=Host(), convert_test_harness_links=True):
     """ Converts a file's |contents| so it will function correctly in its |new_path| in Webkit.
 
     Returns the list of modified properties and the modified text if the file was modifed, None otherwise."""
     contents = host.filesystem.read_binary_file(filename)
-    converter = _W3CTestConverter(new_path, filename, reference_support_info, host)
+    converter = _W3CTestConverter(new_path, filename, reference_support_info, host, convert_test_harness_links)
     if filename.endswith('.css'):
         return converter.add_webkit_prefix_to_unprefixed_properties_and_values(contents)
@@ -53 +53 @@
 
 class _W3CTestConverter(HTMLParser):
-    def __init__(self, new_path, filename, reference_support_info, host=Host()):
+    def __init__(self, new_path, filename, reference_support_info, host=Host(), convert_test_harness_links=True):
         HTMLParser.__init__(self)
 
@@ -71 +71 @@
         resources_relpath = self._filesystem.relpath(resources_path, new_path)
         self.new_test_harness_path = resources_relpath
+        self.convert_test_harness_links = convert_test_harness_links
 
         # These settings might vary between WebKit and Blink
@@ -166 +167 @@
     def convert_attributes_if_needed(self, tag, attrs):
         converted = self.get_starttag_text()
-        if tag in ('script', 'link'):
+        if self.convert_test_harness_links and tag in ('script', 'link'):
             attr_name = 'src'
             if tag != 'script':

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

@@ -121 +121 @@
 def parse_args():
     parser = optparse.OptionParser(usage='usage: %prog [options] w3c_test_directory')
+
     parser.add_option('-n', '--no-overwrite', dest='overwrite', action='store_false', default=True,
         help='Flag to prevent duplicate test files from overwriting existing tests. By default, they will be overwritten')
+    parser.add_option('-l', '--no-links-conversion', dest='convert_test_harness_links', action='store_false', default=True,
+        help='Do not change links (testharness js or css e.g.). By default, links are converted to point to WebKit testharness files.')
+
     parser.add_option('-a', '--all', action='store_true', default=False,
         help='Import all tests including reftests, JS tests, and manual/pixel tests. By default, only reftests and JS tests are imported')
@@ -301 +305 @@
                 if 'html' in str(mimetype[0]) or 'xml' in str(mimetype[0])  or 'css' in str(mimetype[0]):
                     try:
-                        converted_file = convert_for_webkit(new_path, filename=orig_filepath, reference_support_info=reference_support_info)
+                        converted_file = convert_for_webkit(new_path, filename=orig_filepath, reference_support_info=reference_support_info, convert_test_harness_links=self.options.convert_test_harness_links)
                     except:
                         _log.warn('Failed converting %s', orig_filepath)