From 530c951689b90aee5bb54e0fe1f39cd4e0d4adfc Mon Sep 17 00:00:00 2001 From: "kbalazs@webkit.org" Date: Mon, 30 Jan 2012 10:06:15 +0000 Subject: [PATCH] 2012-01-30 Balazs Kelemen [WK2] add flag to only check pixel results if png files exist https://bugs.webkit.org/show_bug.cgi?id=70484 Reviewed by Dirk Pranke. * Scripts/webkitpy/layout_tests/controllers/single_test_runner.py: (SingleTestRunner.__init__): (SingleTestRunner._should_fetch_expected_checksum): * Scripts/webkitpy/layout_tests/controllers/worker.py: (Worker.handle_test_list): * Scripts/webkitpy/layout_tests/models/test_input.py: (TestInput.__init__): * 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_skip_pixel_test_if_no_baseline_option): * WebKitTestRunner/TestInvocation.cpp: (WTR::TestInvocation::setIsPixelTest): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@106222 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- .../Scripts/webkitpy/layout_tests/controllers/single_test_runner.py | 3 +++ Tools/Scripts/webkitpy/layout_tests/controllers/worker.py | 3 +++ Tools/Scripts/webkitpy/layout_tests/models/test_input.py | 3 ++- Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py | 6 ++++++ .../webkitpy/layout_tests/run_webkit_tests_integrationtest.py | 5 +++++ Tools/WebKitTestRunner/TestInvocation.cpp | 2 ++ 6 files changed, 21 insertions(+), 1 deletion(-) diff --git a/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py b/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py index 791fb62..987a779 100644 --- a/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py +++ b/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py @@ -55,6 +55,7 @@ class SingleTestRunner: self._timeout = test_input.timeout self._worker_name = worker_name self._test_name = test_input.test_name + self._should_run_pixel_test = test_input.should_run_pixel_test self._is_reftest = False self._reference_files = port.reference_files(self._test_name) @@ -77,6 +78,8 @@ class SingleTestRunner: self._port.expected_audio(self._test_name)) def _should_fetch_expected_checksum(self): + if not self._should_run_pixel_test: + return False return (self._options.pixel_tests and not (self._options.new_baseline or self._options.reset_results)) diff --git a/Tools/Scripts/webkitpy/layout_tests/controllers/worker.py b/Tools/Scripts/webkitpy/layout_tests/controllers/worker.py index b66ce9b..26ee729 100644 --- a/Tools/Scripts/webkitpy/layout_tests/controllers/worker.py +++ b/Tools/Scripts/webkitpy/layout_tests/controllers/worker.py @@ -108,6 +108,9 @@ class Worker(manager_worker_broker.AbstractWorker): start_time = time.time() num_tests = 0 for test_input in test_list: + # FIXME: DumpRenderTree should also supprort --skip-pixel-test-if-no-baseline. + if self._port.driver_name() == "WebKitTestRunner" and self._port.get_option('skip_pixel_test_if_no_baseline') and self._port.get_option('pixel_tests'): + test_input.should_run_pixel_test = (self._port.expected_image(test_input.test_name) != None) self._run_test(test_input) num_tests += 1 self._worker_connection.yield_to_broker() diff --git a/Tools/Scripts/webkitpy/layout_tests/models/test_input.py b/Tools/Scripts/webkitpy/layout_tests/models/test_input.py index 6b5d148..5c8b30d 100644 --- a/Tools/Scripts/webkitpy/layout_tests/models/test_input.py +++ b/Tools/Scripts/webkitpy/layout_tests/models/test_input.py @@ -36,7 +36,7 @@ class TestInput: ref_file = None is_mismatch_reftest = None - def __init__(self, test_name, timeout): + def __init__(self, test_name, timeout, should_run_pixel_test=True): """Holds the input parameters for a test. Args: test: name of test (not an absolute path!) @@ -46,6 +46,7 @@ class TestInput: """ self.test_name = test_name self.timeout = timeout + self.should_run_pixel_test = should_run_pixel_test def __repr__(self): return "TestInput('%s', %d)" % (self.test_name, self.timeout) diff --git a/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py b/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py index 366e335..754730c 100755 --- a/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py +++ b/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py @@ -178,6 +178,9 @@ def _set_up_derived_options(port, options): 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") + 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)") + return warnings @@ -314,6 +317,9 @@ def parse_args(args=None): optparse.make_option("--no-new-test-results", action="store_false", 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."), optparse.make_option("--skip-failing-tests", action="store_true", default=False, help="Skip tests that are expected to fail. " "Note: When using this option, you might miss new crashes " diff --git a/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py b/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py index 48f90a4..9f17ea7 100755 --- a/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py +++ b/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py @@ -385,6 +385,11 @@ class MainTest(unittest.TestCase): 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_iterations(self): tests_to_run = ['passes/image.html', 'passes/text.html'] tests_run = get_tests_run(['--iterations', '2'] + tests_to_run, tests_included=True, flatten_batches=True) diff --git a/Tools/WebKitTestRunner/TestInvocation.cpp b/Tools/WebKitTestRunner/TestInvocation.cpp index 8e3c229..46dea36 100644 --- a/Tools/WebKitTestRunner/TestInvocation.cpp +++ b/Tools/WebKitTestRunner/TestInvocation.cpp @@ -106,6 +106,8 @@ TestInvocation::~TestInvocation() void TestInvocation::setIsPixelTest(const std::string& expectedPixelHash) { + if (!expectedPixelHash.length()) + return; m_dumpPixels = true; m_expectedPixelHash = expectedPixelHash; } -- 2.7.4