Changeset 90074 in webkit

Timestamp:

Jun 29, 2011 5:42:39 PM (13 years ago)

Author:

abarth@webkit.org

Message:

2011-06-29 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

new-run-webkit-tests doesn't support sample-on-timeout
​https://bugs.webkit.org/show_bug.cgi?id=56731

• Scripts/webkitpy/layout_tests/port/server_process.py:
• Scripts/webkitpy/layout_tests/port/server_process_unittest.py:
• Scripts/webkitpy/layout_tests/run_webkit_tests.py:

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2011-06-29  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        new-run-webkit-tests doesn't support sample-on-timeout
+        https://bugs.webkit.org/show_bug.cgi?id=56731
+
+        * Scripts/webkitpy/layout_tests/port/server_process.py:
+        * Scripts/webkitpy/layout_tests/port/server_process_unittest.py:
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+
 2011-06-29  Eric Seidel  <eric@webkit.org>
 

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

@@ -42 +42 @@
 from webkitpy.common.system.executive import Executive
 
-_log = logging.getLogger("webkitpy.layout_tests.port.server_process")
+_log = logging.getLogger(__file__)
 
 
@@ -167 +167 @@
             self.handle_interrupt()
 
+    def _sample(self):
+        if sys.platform != "darwin":
+            return
+        _log.warning('Sampling process... (use --no-sample-on-timeout to skip this step)')
+        hang_report = os.path.join(self._port.results_directory(), "%s-%s.sample.txt" % (self._name, self._proc.pid))
+        self._executive.run_command([
+            "/usr/bin/sample",
+            self._proc.pid,
+            10,
+            10,
+            "-file",
+            hang_report,
+        ])
+
     def _read(self, timeout, size):
         """Internal routine that actually does the read."""
@@ -185 +199 @@
                         self._check_for_crash()
                 self.timed_out = True
+                if not self.crashed:
+                    self._sample()
 
             # Check to see if we have any output we can return.

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

@@ -27 +27 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import sys
 import unittest
 
 from webkitpy.layout_tests.port import server_process
+from webkitpy.common.system.executive_mock import MockExecutive2
+from webkitpy.common.system.outputcapture import OutputCapture
+
+
+def _logging_run_command(args):
+    print args
+
+
+class TrivialMockPort(object):
+    def results_directory(self):
+        return "/mock/results"
 
 
@@ -73 +85 @@
         self.assertEquals(server_process.broken_pipes, [server_process.stdin])
 
-
-if __name__ == '__main__':
-    unittest.main()
+    def test_sample_process(self):
+        # Currently, sample-on-timeout only works on Darwin.
+        if sys.platform != "darwin":
+            return
+        server_process = FakeServerProcess(port_obj=TrivialMockPort(), name="test", cmd=["test"], executive=MockExecutive2(run_command_fn=_logging_run_command))
+        server_process._proc = MockProc(server_process)
+        expected_stdout = "['/usr/bin/sample', 1, 10, 10, '-file', '/mock/results/test-1.sample.txt']\n"
+        OutputCapture().assert_outputs(self, server_process._sample, expected_stdout=expected_stdout)

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

@@ -277 +277 @@
     # FIXME: Need: -g, --guard for guard malloc support on Mac.
     # FIXME: Need: -l --leaks    Enable leaks checking.
-    # FIXME: Need: --sample-on-timeout Run sample on timeout
 
     old_run_webkit_tests_compat = [
-        # NRWT doesn't sample on timeout yet anyway.
-        _compat_shim_option("--no-sample-on-timeout"),
         # FIXME: NRWT needs to support remote links eventually.
         _compat_shim_option("--use-remote-links-to-tests"),
@@ -293 +290 @@
         optparse.make_option("--no-pixel-tests", action="store_false",
             dest="pixel_tests", help="Disable pixel-to-pixel PNG comparisons"),
+        optparse.make_option("--no-sample-on-timeout", action="store_false",
+            dest="sample_on_timeout", help="Don't run sample on timeout (Mac OS X only)"),
         optparse.make_option("--tolerance",
             help="Ignore image differences less than this percentage (some "