Changeset 85119 in webkit

Timestamp:

Apr 27, 2011 4:17:43 PM (13 years ago)

Author:

weinig@apple.com

Message:

2011-04-26 Sam Weinig <​sam@webkit.org>

Reviewed by David Levin.

Add a few more missing options to new-run-webkit-tests
​https://bugs.webkit.org/show_bug.cgi?id=59567

Add support for:

--threaded
--gc-between-tests
--complex-text

• Scripts/webkitpy/layout_tests/port/webkit.py:
• Scripts/webkitpy/layout_tests/run_webkit_tests.py:
• Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/webkit.py (modified) (2 diffs)
• Scripts/webkitpy/layout_tests/run_webkit_tests.py (modified) (3 diffs)
• Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-26  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by David Levin.
+
+        Add a few more missing options to new-run-webkit-tests
+        https://bugs.webkit.org/show_bug.cgi?id=59567
+
+        Add support for:
+            --threaded
+            --gc-between-tests
+            --complex-text
+
+        * Scripts/webkitpy/layout_tests/port/webkit.py:
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+        * Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py:
+
 2011-04-27  Mark Rowe  <mrowe@apple.com>
 

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

@@ -2 +2 @@
 # Copyright (C) 2010 Google Inc. All rights reserved.
 # Copyright (C) 2010 Gabor Rapcsanyi <rgabor@inf.u-szeged.hu>, University of Szeged
+# Copyright (C) 2011 Apple Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -376 +377 @@
         if self._port.get_option('pixel_tests'):
             cmd.append('--pixel-tests')
+        if self._port.get_option('gc_between_tests'):
+            cmd.append('--gc-between-tests')
+        if self._port.get_option('complex_text'):
+            cmd.append('--complex-text')
+        if self._port.get_option('threaded'):
+            cmd.append('--threaded')
+
         cmd.extend(self._port.get_option('additional_drt_flag', []))
         cmd.append('-')

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

@@ -2 +2 @@
 # Copyright (C) 2010 Google Inc. All rights reserved.
 # Copyright (C) 2010 Gabor Rapcsanyi (rgabor@inf.u-szeged.hu), University of Szeged
+# Copyright (C) 2011 Apple Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -253 +254 @@
             default=False,
             help="Run graphics tests on real GPU hardware vs software"),
+    ]
+
+    webkit_options = [
+        optparse.make_option("--gc-between-tests", action="store_true", default=False,
+            help="Force garbage collection between each test"),
+        optparse.make_option("--complex-text", action="store_true", default=False,
+            help="Use the complex text code path for all text (Mac OS X and Windows only)"),
+        optparse.make_option("--threaded", action="store_true", default=False,
+            help="Run a concurrent JavaScript thead with each test")
     ]
 
@@ -428 +438 @@
 
     option_list = (configuration_options + print_options +
-                   chromium_options + results_options + test_options +
-                   misc_options + results_json_options +
-                   old_run_webkit_tests_compat)
+                   chromium_options + webkit_options + results_options + test_options +
+                   misc_options + results_json_options + old_run_webkit_tests_compat)
     option_parser = optparse.OptionParser(option_list=option_list)
 

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

@@ -2 +2 @@
 # Copyright (C) 2010 Google Inc. All rights reserved.
 # Copyright (C) 2010 Gabor Rapcsanyi (rgabor@inf.u-szeged.hu), University of Szeged
+# Copyright (C) 2011 Apple Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -296 +297 @@
         self.assertTrue(passing_run(['--randomize-order']))
 
+    def test_gc_between_tests(self):
+        self.assertTrue(passing_run(['--gc-between-tests']))
+
+    def test_complex_text(self):
+        self.assertTrue(passing_run(['--complex-text']))
+
+    def test_threaded(self):
+        self.assertTrue(passing_run(['--threaded']))
+
     def test_run_chunk(self):
         # Test that we actually select the right chunk