Changeset 6a490b2 for tests/pybin/tools.py

Timestamp:

May 11, 2020, 1:53:29 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

504a7dc

Parents:

b7d6a36 (diff), a7b486b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into relaxed_ready

File:

• tests/pybin/tools.py (modified) (2 diffs)

tests/pybin/tools.py

@@ -75 +75 @@
                                         return proc.returncode, out.decode("utf-8") if out else None
                                 except subprocess.TimeoutExpired:
-                                        proc.send_signal(signal.SIGABRT)
-                                        proc.communicate()
-                                        return 124, str(None)
+                                        if settings.timeout2gdb:
+                                                print("Process {} timeout".format(proc.pid))
+                                                proc.communicate()
+                                                return 124, str(None)
+                                        else:
+                                                proc.send_signal(signal.SIGABRT)
+                                                proc.communicate()
+                                                return 124, str(None)
 
         except Exception as ex:
@@ -322 +327 @@
         raise argparse.ArgumentTypeError(msg)
 
+# Convert a function that converts a string to one that converts comma separated string.
+def comma_separated(elements):
+    return lambda string: [elements(part) for part in string.split(',')]
+
 def fancy_print(text):
         column = which('column')