Changeset 3d5701e for tests/test.py

Timestamp:

Feb 25, 2020, 1:17:33 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

7dc2e015

Parents:

9fb8f01 (diff), dd9e1ca (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:

resolve conflict

File:

• tests/test.py (modified) (5 diffs)

tests/test.py

@@ -10 +10 @@
 import tempfile
 import time
+
+import os
+import psutil
+import signal
 
 ################################################################################
@@ -143 +147 @@
         # build, skipping to next test on error
         with Timed() as comp_dur:
-                make_ret, _ = make( test.target(), output=subprocess.DEVNULL, error=out_file, error_file = err_file )
+                make_ret, _ = make( test.target(), output_file=subprocess.DEVNULL, error=out_file, error_file = err_file )
 
         run_dur = None
         # run everything in a temp directory to make sure core file are handled properly
         with tempdir():
-                # if the make command succeds continue otherwise skip to diff
+                # if the make command succeeds continue otherwise skip to diff
                 if success(make_ret):
                         with Timed() as run_dur:
                                 if settings.dry_run or is_exe(exe_file):
                                         # run test
-                                        retcode, _ = sh(exe_file, output=out_file, input=in_file, timeout=True)
+                                        retcode, _ = sh(exe_file, output_file=out_file, input_file=in_file, timeout=True)
                                 else :
                                         # simply cat the result into the output
@@ -210 +214 @@
         except KeyboardInterrupt:
                 return False, ""
-        except:
-                print("Unexpected error in worker thread", file=sys.stderr)
+        except Exception as ex:
+                print("Unexpected error in worker thread: %s" % ex, file=sys.stderr)
                 sys.stderr.flush()
                 return False, ""
@@ -219 +223 @@
 def run_tests(tests, jobs) :
         # clean the sandbox from previous commands
-        make('clean', output=subprocess.DEVNULL, error=subprocess.DEVNULL)
+        make('clean', output_file=subprocess.DEVNULL, error=subprocess.DEVNULL)
+
+        # since python prints stacks by default on a interrupt, redo the interrupt handling to be silent
+        def worker_init():
+                def sig_int(signal_num, frame):
+                        pass
+
+                signal.signal(signal.SIGINT, sig_int)
 
         # create the executor for our jobs and handle the signal properly
-        pool = multiprocessing.Pool(jobs)
+        pool = multiprocessing.Pool(jobs, worker_init)
 
         failed = False
+
+        def stop(x, y):
+                print("Tests interrupted by user", file=sys.stderr)
+                sys.exit(1)
+        signal.signal(signal.SIGINT, stop)
 
         # for each test to run
@@ -260 +276 @@
 
         # clean the workspace
-        make('clean', output=subprocess.DEVNULL, error=subprocess.DEVNULL)
+        make('clean', output_file=subprocess.DEVNULL, error=subprocess.DEVNULL)
 
         return 1 if failed else 0