Changeset 2a3d446 for tests

Timestamp:

Dec 12, 2019, 10:25:49 AM (6 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:

983edfd

Parents:

f80f840 (diff), 737c98a (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

Location:

tests

Files:

• concurrent/.expect/keywordErrors.txt (modified) (1 diff)
• test.py (modified) (2 diffs)

tests/concurrent/.expect/keywordErrors.txt

@@ -1 +1 @@
 concurrent/keywordErrors.cfa:1:1 error: thread keyword requires threads to be in scope, add #include <thread.hfa>
-struct A: with body 1
+thread A: with body 1
 
 concurrent/keywordErrors.cfa:6:1 error: thread keyword requires threads to be in scope, add #include <thread.hfa>
-struct B: with body 1
+thread B: with body 1
 

tests/test.py

@@ -10 +10 @@
 import tempfile
 import time
+
+import os
+import psutil
+import signal
 
 ################################################################################
@@ -221 +225 @@
         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