Changeset 81441 in webkit

Timestamp:

Mar 17, 2011 10:09:20 PM (13 years ago)

Author:

hayato@chromium.org

Message:

2011-03-10 Hayato Ito <​hayato@chromium.org>

Reviewed by Tony Chang.

Add a check logic for reftests in case that a reftest is marked AS REBASELINE.

​https://bugs.webkit.org/show_bug.cgi?id=56076

• Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py (modified) (5 diffs)
• Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-03-10  Hayato Ito  <hayato@chromium.org>
+
+        Reviewed by Tony Chang.
+
+        Add a check logic for reftests in case that a reftest is marked AS REBASELINE.
+
+        https://bugs.webkit.org/show_bug.cgi?id=56076
+
+        * Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py:
+
 2011-03-17  Adam Roben  <aroben@apple.com>
 

trunk/Tools/Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py

@@ -172 +172 @@
             self._target_port.test_platform_name_to_name(platform), options,
             filesystem=self._filesystem, rebaselining=True)
-        self._rebaselining_tests = []
+        self._rebaselining_tests = set()
         self._rebaselined_tests = []
 
@@ -195 +195 @@
         log_dashed_string('Compiling rebaselining tests', self._platform)
         if not self._compile_rebaselining_tests():
+            return False
+        if not self.get_rebaselining_tests():
             return True
 
@@ -238 +240 @@
 
         Returns:
-          List of tests that need rebaselining or
-          None if there is no such test.
+          False if reftests are wrongly marked as 'needs rebaselining' or True
         """
 
@@ -246 +247 @@
         if not self._rebaselining_tests:
             _log.warn('No tests found that need rebaselining.')
-            return None
+            return True
+
+        fs = self._target_port._filesystem
+        for test in self._rebaselining_tests:
+            test_abspath = self._target_port.abspath_for_test(test)
+            if (fs.exists(self._target_port.reftest_expected_filename(test_abspath)) or
+                fs.exists(self._target_port.reftest_expected_mismatch_filename(test_abspath))):
+                _log.error('%s seems to be a reftest. We can not rebase for reftests.', test)
+                self._rebaselining_tests = set()
+                return False
 
         _log.info('Total number of tests needing rebaselining '
@@ -257 +267 @@
             test_no += 1
 
-        return self._rebaselining_tests
+        return True
 
     def _get_latest_revision(self, url):

trunk/Tools/Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests_unittest.py

@@ -175 +175 @@
         self.assertEqual(len(filesystem.written_files), 1)
 
+    def test_rebaselining_tests(self):
+        rebaseliner, filesystem = self.make_rebaseliner(
+            "BUGX REBASELINE MAC : failures/expected/image.html = IMAGE")
+        compile_success = rebaseliner._compile_rebaselining_tests()
+        self.assertTrue(compile_success)
+        self.assertEqual(set(['failures/expected/image.html']), rebaseliner.get_rebaselining_tests())
+
+    def test_rebaselining_tests_should_ignore_reftests(self):
+        rebaseliner, filesystem = self.make_rebaseliner(
+            "BUGX REBASELINE : failures/expected/reftest.html = IMAGE")
+        compile_success = rebaseliner._compile_rebaselining_tests()
+        self.assertFalse(compile_success)
+        self.assertFalse(rebaseliner.get_rebaselining_tests())
+
     def test_one_platform(self):
         rebaseliner, filesystem = self.make_rebaseliner(