Changeset 112406 in webkit

Timestamp:

Mar 28, 2012 8:53:47 AM (12 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] Add --skipped command line option to Tools/Scripts/run-gtk-tests
​https://bugs.webkit.org/show_bug.cgi?id=82341

Reviewed by Martin Robinson.

Add --skipped=skip|ignore|only command line option.

• Scripts/run-gtk-tests:

(TestRunner._test_cases_to_skip): Return the list of test cases
to skip for the given test depending on the skipped action.
(TestRunner._should_run_test): Decide whether to run the test or
not depending on the skipped action.
(TestRunner.run_tests): Only show the list of skipped tests when
skipped action is 'skip'.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/run-gtk-tests (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-03-28  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Add --skipped command line option to Tools/Scripts/run-gtk-tests
+        https://bugs.webkit.org/show_bug.cgi?id=82341
+
+        Reviewed by Martin Robinson.
+
+        Add --skipped=skip|ignore|only command line option.
+
+        * Scripts/run-gtk-tests:
+        (TestRunner._test_cases_to_skip): Return the list of test cases
+        to skip for the given test depending on the skipped action.
+        (TestRunner._should_run_test): Decide whether to run the test or
+        not depending on the skipped action.
+        (TestRunner.run_tests): Only show the list of skipped tests when
+        skipped action is 'skip'.
+
 2012-03-28  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Tools/Scripts/run-gtk-tests

@@ -206 +206 @@
 
     def _test_cases_to_skip(self, test):
+        if self._options.skipped_action != 'skip':
+            return []
+
         skipped = self._find_skipped_test(test)
         if skipped is not None:
@@ -212 +215 @@
 
     def _should_run_test(self, test):
+        # Skipped test are ignored, run all tests.
+        if self._options.skipped_action == 'ignore':
+            return True
+
         skipped = self._find_skipped_test(test)
-        return skipped is None or skipped.test_cases
+        # By default skipped test are skipped, run them only when there are specific test cases failing.
+        if self._options.skipped_action == 'skip':
+            return skipped is None or skipped.test_cases
+
+        # Run only skipped tests.
+        return skipped is not None
 
     def _run_test(self, test):
@@ -258 +270 @@
             sys.stdout.flush()
 
-        if self._skipped_tests:
+        if self._skipped_tests and self._options.skipped_action == 'skip':
             sys.stdout.write("Tests skipped:\n%s\n" % "\n".join([str(skipped) for skipped in self._skipped_tests]))
             sys.stdout.flush()
@@ -277 +289 @@
     option_parser.add_option('--display', action='store', dest='display', default=':55',
                              help='Display to run Xvfb')
+    option_parser.add_option('--skipped', action='store', dest='skipped_action',
+                             choices=['skip', 'ignore', 'only'], default='skip',
+                             metavar='skip|ignore|only',
+                             help='Specifies how to treat the skipped tests')
     options, args = option_parser.parse_args()