Changeset 72564 in webkit

Timestamp:

Nov 22, 2010 2:52:30 PM (13 years ago)

Author:

hayato@chromium.org

Message:

2010-11-22 Hayato Ito <​hayato@chromium.org>

Reviewed by Shinichiro Hamaji.

Ignore reference files which will be used by reftests when collecting
test cases.
​https://bugs.webkit.org/show_bug.cgi?id=49835

• Scripts/webkitpy/layout_tests/port/test_files.py:
• Scripts/webkitpy/layout_tests/port/test_files_unittest.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/test_files.py (modified) (3 diffs)
• Scripts/webkitpy/layout_tests/port/test_files_unittest.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-11-22  Hayato Ito  <hayato@chromium.org>
+
+        Reviewed by Shinichiro Hamaji.
+
+        Ignore reference files which will be used by reftests when collecting
+        test cases.
+        https://bugs.webkit.org/show_bug.cgi?id=49835
+
+        * Scripts/webkitpy/layout_tests/port/test_files.py:
+        * Scripts/webkitpy/layout_tests/port/test_files_unittest.py:
+
 2010-11-22  Adam Roben  <aroben@apple.com>
 

trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/test_files.py

@@ -79 +79 @@
     test_files = set()
     for path in paths_to_walk:
-        if os.path.isfile(path) and _has_supported_extension(path):
+        if os.path.isfile(path) and _is_test_file(path):
             test_files.add(os.path.normpath(path))
             continue
@@ -96 +96 @@
 
             for filename in files:
-                if _has_supported_extension(filename):
+                if _is_test_file(filename):
                     filename = os.path.join(root, filename)
                     filename = os.path.normpath(filename)
@@ -112 +112 @@
     extension = os.path.splitext(filename)[1]
     return extension in _supported_file_extensions
+
+
+def _is_reference_html_file(filename):
+    """Return true if the filename points to a reference HTML file."""
+    if (filename.endswith('-expected.html') or
+        filename.endswith('-expected-mismatch.html')):
+        _log.warn("Reftests are not supported - ignoring %s" % filename)
+        return True
+    return False
+
+
+def _is_test_file(filename):
+    """Return true if the filename points to a test file."""
+    return (_has_supported_extension(filename) and
+            not _is_reference_html_file(filename))

trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/test_files_unittest.py

@@ -64 +64 @@
         self.assertEqual(tests, set([]))
 
+    def test_is_test_file(self):
+        self.assertTrue(test_files._is_test_file('foo.html'))
+        self.assertTrue(test_files._is_test_file('foo.shtml'))
+        self.assertFalse(test_files._is_test_file('foo.png'))
+        self.assertFalse(test_files._is_test_file('foo-expected.html'))
+        self.assertFalse(test_files._is_test_file('foo-expected-mismatch.html'))
+
 
 if __name__ == '__main__':