Changes in / [0bd5cfb:778452d]

Location:

tests

Files:

• pybin/settings.py (modified) (2 diffs)
• pybin/tools.py (modified) (1 diff)
• test.py (modified) (2 diffs)

tests/pybin/settings.py

@@ -123 +123 @@
         global output_width
         global timeout
-        global timeout2gdb
 
         arch         = Architecture(options.arch)
@@ -135 +134 @@
         output_width = 24
         timeout      = Timeouts(options.timeout, options.global_timeout)
-        timeout2gdb  = options.timeout_with_gdb
 
         # if we distribute, distcc errors will fail tests, use log file for distcc

tests/pybin/tools.py

@@ -75 +75 @@
                                         return proc.returncode, out.decode("utf-8") if out else None
                                 except subprocess.TimeoutExpired:
-                                        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)
+                                        proc.send_signal(signal.SIGABRT)
+                                        proc.communicate()
+                                        return 124, str(None)
 
         except Exception as ex:

tests/test.py

@@ -91 +91 @@
         parser.add_argument('--timeout', help='Maximum duration in seconds after a single test is considered to have timed out', type=int, default=60)
         parser.add_argument('--global-timeout', help='Maximum cumulative duration in seconds after the ALL tests are considered to have timed out', type=int, default=7200)
-        parser.add_argument('--timeout-with-gdb', help='Instead of killing the command when it times out, orphan it and print process id to allow gdb to attach', type=yes_no, default="no")
         parser.add_argument('--dry-run', help='Don\'t run the tests, only output the commands', action='store_true')
         parser.add_argument('--list', help='List all test available', action='store_true')
@@ -193 +192 @@
         rm(exe_file)
 
-        print("HERE")
-
         return retcode, error, [comp_dur.duration, run_dur.duration if run_dur else None]