Changeset e791851

Timestamp:

Jun 25, 2019, 3:19:49 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

ab8315f

Parents:

8ecb590

Message:

Tests now print progress as they go if run in a tty

File:

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

tests/test.py

@@ -202 +202 @@
                 if error :
                         text = text + '\n' + error
-                        out = sys.stderr
-
-                print(text, file = out)
-                sys.stdout.flush()
-                sys.stderr.flush()
-
-                return retcode != TestResult.SUCCESS
+
+                return retcode == TestResult.SUCCESS, text
         except KeyboardInterrupt:
-                False
+                False, ""
 
 # run the given list of tests with the given parameters
@@ -220 +215 @@
         pool = multiprocessing.Pool(jobs)
 
+        failed = False
+
         # for each test to run
         try :
-                results = pool.map_async(
+                num = len(tests)
+                fancy = sys.stdout.isatty()
+                for i, (succ, txt) in enumerate(pool.imap(
                         run_test_worker,
                         tests,
                         chunksize = 1
-                ).get(settings.timeout.total)
+                )) :
+                        if not succ :
+                                failed = True
+
+                        print("       " + txt)
+
+                        if(fancy and i != num):
+                                print("%d/%d" % (i, num), end='\r')
+                                sys.stdout.flush()
+
         except KeyboardInterrupt:
                 pool.terminate()
-                print("Tests interrupted by user")
-                sys.exit(1)
+                print("Tests interrupted by user", file=sys.stderr)
+                failed = True
+        except multiprocessing.TimeoutError:
+                pool.terminate()
+                print("ERROR: Test suite timed out", file=sys.stderr)
+                failed = True
 
         # clean the workspace
         make('clean', output=subprocess.DEVNULL, error=subprocess.DEVNULL)
 
-        for failed in results:
-                if failed :
-                        return 1
-
-        return 0
+        return 1 if failed else 0