Title: [123776] trunk/Tools
- Revision
- 123776
- Author
- kbal...@webkit.org
- Date
- 2012-07-26 11:26:41 -0700 (Thu, 26 Jul 2012)
Log 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):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (123775 => 123776)
--- trunk/Tools/ChangeLog 2012-07-26 18:26:32 UTC (rev 123775)
+++ trunk/Tools/ChangeLog 2012-07-26 18:26:41 UTC (rev 123776)
@@ -1,3 +1,20 @@
+2012-07-26 Balazs Kelemen <kbal...@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.b...@softathome.com>
Add FastMalloc statistics in window.internals
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py (123775 => 123776)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2012-07-26 18:26:32 UTC (rev 123775)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2012-07-26 18:26:41 UTC (rev 123776)
@@ -1271,8 +1271,6 @@
if not self.supports_switching_pixel_tests_per_test():
# 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)
return self._should_run_as_pixel_test(test_input)
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py (123775 => 123776)
--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2012-07-26 18:26:32 UTC (rev 123775)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2012-07-26 18:26:41 UTC (rev 123776)
@@ -175,9 +175,6 @@
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):
warnings.append("--ignore-metrics has no effect with --new-baselines or with --reset-results")
@@ -325,9 +322,6 @@
optparse.make_option("--no-new-test-results", action=""
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=""
- 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.
optparse.make_option("--pixel-test-directory", action="" default=[], dest="pixel_test_directories",
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py (123775 => 123776)
--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2012-07-26 18:26:32 UTC (rev 123775)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2012-07-26 18:26:41 UTC (rev 123776)
@@ -404,11 +404,6 @@
tests_run = get_tests_run(['--repeat-each', '2'] + tests_to_run, tests_included=True, flatten_batches=True)
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.
tests_run = get_tests_run(['-i', 'passes', 'passes/image.html'], flatten_batches=True, tests_included=True)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
