[lit] Fix handling of per test timeout when the installed psutil version

[oota-llvm.git] / utils / lit / lit / util.py

diff --git a/utils/lit/lit/util.py b/utils/lit/lit/util.py
index a6e8d52c075491bd41a04f5c2a62d365c1643f74..40a577168692492456b0d5a22a7cfbe72acec812 100644 (file)
--- a/utils/lit/lit/util.py
+++ b/utils/lit/lit/util.py
@@ -267,7 +267,14 @@ def killProcessAndChildren(pid):
     import psutil
     try:
         psutilProc = psutil.Process(pid)
-        for child in psutilProc.children(recursive=True):
+        # Handle the different psutil API versions
+        try:
+            # psutil >= 2.x
+            children_iterator = psutilProc.children(recursive=True)
+        except AttributeError:
+            # psutil 1.x
+            children_iterator = psutilProc.get_children(recursive=True)
+        for child in children_iterator:
             try:
                 child.kill()
             except psutil.NoSuchProcess: