Changeset 121571 in webkit

Timestamp:

Jun 29, 2012 10:29:42 AM (12 years ago)

Author:

zoltan@webkit.org

Message:

Add support for --force parameter to run-performance-tests
​https://bugs.webkit.org/show_bug.cgi?id=90279

Reviewed by Dirk Pranke.

It's helpful to be able to run tests from the Skipped list of the performance tests.

• Scripts/webkitpy/performance_tests/perftestsrunner.py:

(PerfTestsRunner._parse_args):
(PerfTestsRunner._collect_tests):

• Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py: Add test.

(test_collect_tests_with_skipped_list):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/performance_tests/perftestsrunner.py (modified) (2 diffs, 1 prop)
• Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-06-29  Zoltan Horvath  <zoltan@webkit.org>
+
+        Add support for --force parameter to run-performance-tests
+        https://bugs.webkit.org/show_bug.cgi?id=90279
+
+        Reviewed by Dirk Pranke.
+
+        It's helpful to be able to run tests from the Skipped list of the performance tests.
+
+        * Scripts/webkitpy/performance_tests/perftestsrunner.py:
+        (PerfTestsRunner._parse_args):
+        (PerfTestsRunner._collect_tests):
+        * Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py: Add test.
+        (test_collect_tests_with_skipped_list):
+
 2012-06-29  Tony Chang  <tony@chromium.org>
 

trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py

@@ -102 +102 @@
             optparse.make_option("--replay", dest="replay", action="store_true", default=False,
                 help="Run replay tests."),
+            optparse.make_option("--force", dest="skipped", action="store_true", default=False,
+                help="Run all tests, including the ones in the Skipped list."),
             ]
         return optparse.OptionParser(option_list=(perf_option_list)).parse_args(args)
@@ -129 +131 @@
         for path in test_files:
             relative_path = self._port.relative_perf_test_filename(path).replace('\\', '/')
-            if self._port.skips_perf_test(relative_path):
+            if self._port.skips_perf_test(relative_path) and not self._options.skipped:
                 continue
             test = PerfTestFactory.create_perf_test(self._port, relative_path, path)

trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py

@@ -398 +398 @@
         self.assertEqual(self._collect_tests_and_sort_test_name(runner), ['inspector/test1.html', 'inspector/test2.html'])
 
+    def test_collect_tests_with_skipped_list(self):
+        runner, port = self.create_runner(args=['--force'])
+
+        self._add_file(runner, 'inspector', 'test1.html')
+        self._add_file(runner, 'inspector', 'unsupported_test1.html')
+        self._add_file(runner, 'inspector', 'test2.html')
+        self._add_file(runner, 'inspector/resources', 'resource_file.html')
+        self._add_file(runner, 'unsupported', 'unsupported_test2.html')
+        port.skipped_perf_tests = lambda: ['inspector/unsupported_test1.html', 'unsupported']
+        self.assertEqual(self._collect_tests_and_sort_test_name(runner), ['inspector/test1.html', 'inspector/test2.html', 'inspector/unsupported_test1.html', 'unsupported/unsupported_test2.html'])
+
     def test_collect_tests_with_page_load_svg(self):
         runner, port = self.create_runner()