Changeset 123776 in webkit

Timestamp:

Jul 26, 2012, 11:26:41 AM (13 years ago)

Author:

kbalazs@webkit.org

Message:

[nrwt] get rid of --skip-pixel-test-if-no-baseline
​https://bugs.webkit.org/show_bug.cgi?id=92377

Reviewed by Adam Barth.

Remove the option and all code paths that handled it.

• Scripts/webkitpy/layout_tests/port/base.py:

(Port.should_run_as_pixel_test):

• Scripts/webkitpy/layout_tests/run_webkit_tests.py:

(_set_up_derived_options):
(parse_args):

• Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:

(MainTest.test_repeat_each):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/base.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/run_webkit_tests.py (modified) (2 diffs)
• Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-07-26  Balazs Kelemen  <kbalazs@webkit.org>
+
+        [nrwt] get rid of --skip-pixel-test-if-no-baseline
+        https://bugs.webkit.org/show_bug.cgi?id=92377
+
+        Reviewed by Adam Barth.
+
+        Remove the option and all code paths that handled it.
+
+        * Scripts/webkitpy/layout_tests/port/base.py:
+        (Port.should_run_as_pixel_test):
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+        (_set_up_derived_options):
+        (parse_args):
+        * Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
+        (MainTest.test_repeat_each):
+
 2012-07-26  Olivier Blin  <olivier.blin@softathome.com>
 

trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py

@@ -1272 +1272 @@
             # Cannot do more filtering without this.
             return True
-        if self._options.skip_pixel_test_if_no_baseline and not self.expected_image(test_input.test_name):
-            return False
         if self._options.pixel_test_directories:
             return any(test_input.test_name.startswith(directory) for directory in self._options.pixel_test_directories)

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

@@ -175 +175 @@
         warnings.append("--force/--skipped=%s overrides --no-http." % (options.skipped))
         options.http = True
-
-    if options.skip_pixel_test_if_no_baseline and not options.pixel_tests:
-        warnings.append("--skip-pixel-test-if-no-baseline is only supported with -p (--pixel-tests)")
 
     if options.ignore_metrics and (options.new_baseline or options.reset_results):
@@ -326 +323 @@
             dest="new_test_results", default=True,
             help="Don't create new baselines when no expected results exist"),
-        optparse.make_option("--skip-pixel-test-if-no-baseline", action="store_true",
-            dest="skip_pixel_test_if_no_baseline", help="Do not generate and check pixel result in the case when "
-                 "no image baseline is available for the test."),
 
         #FIXME: we should support a comma separated list with --pixel-test-directory as well.

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

@@ -405 +405 @@
         self.assertEquals(tests_run, ['passes/image.html', 'passes/image.html', 'passes/text.html', 'passes/text.html'])
 
-    def test_skip_pixel_test_if_no_baseline_option(self):
-        tests_to_run = ['passes/image.html', 'passes/text.html']
-        tests_run = get_tests_run(['--skip-pixel-test-if-no-baseline'] + tests_to_run, tests_included=True, flatten_batches=True)
-        self.assertEquals(tests_run, ['passes/image.html', 'passes/text.html'])
-
     def test_ignore_flag(self):
         # Note that passes/image.html is expected to be run since we specified it directly.