new-run-webkit-tests does not respect --no-sample-on-timeout switch

https://bugs.webkit.org/show_bug.cgi?id=120491

Patch by Joseph Pecoraro <pecoraro@apple.com> on 2013-08-29
Reviewed by Darin Adler.

* Scripts/webkitpy/port/server_process.py:
(ServerProcess._handle_timeout):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@154857 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 507f19eefb94723037653194fa850b3664f8df84..5554156e5ead42e7558321e2dd51d8d21481c83a 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2013-08-29  Joseph Pecoraro  <pecoraro@apple.com>
+
+        new-run-webkit-tests does not respect --no-sample-on-timeout switch
+        https://bugs.webkit.org/show_bug.cgi?id=120491
+
+        Reviewed by Darin Adler.
+
+        * Scripts/webkitpy/port/server_process.py:
+        (ServerProcess._handle_timeout):
+
 2013-08-29  Sam Weinig  <sam@webkit.org>
 
         Add ENABLE guards for Promises

diff --git a/Tools/Scripts/webkitpy/port/server_process.py b/Tools/Scripts/webkitpy/port/server_process.py
index 8184d2587ab1d9d9c8a365c5f1ba50d09680969e..56f9fd8d1732c1a002ac48743c6b7ed83a4754f6 100644 (file)
--- a/Tools/Scripts/webkitpy/port/server_process.py
+++ b/Tools/Scripts/webkitpy/port/server_process.py
@@ -212,7 +212,8 @@ class ServerProcess(object):
 
     def _handle_timeout(self):
         self.timed_out = True
-        self._port.sample_process(self._name, self._proc.pid)
+        if self._port.get_option("sample_on_timeout"):
+            self._port.sample_process(self._name, self._proc.pid)
 
     def _split_string_after_index(self, string, index):
         return string[:index], string[index:]