Changeset 0a1a680

Timestamp:

Jan 30, 2017, 12:28:04 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

f97b614

Parents:

8804701

Message:

Tests no longer print screen fulls of stack traces when being interrupted

File:

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

src/tests/test.py

@@ -168 +168 @@
 
 def run_test_instance(t, generate, dry_run, debug) :
-        # print formated name
-        name_txt = "%20s  " % t.name
-
-        #run the test instance and collect the result
-        test_failed, error = run_single_test(t, generate, dry_run, debug)
-
-        # update output based on current action
-        if generate :
-                failed_txt = "ERROR"
-                success_txt = "Done"
-        else :
-                failed_txt = "FAILED"
-                success_txt = "PASSED"
-
-        #print result with error if needed
-        text = name_txt + (failed_txt if test_failed else success_txt)
-        out = sys.stdout
-        if error :
-                text = text + "\n" + error
-                out = sys.stderr
-
-        print(text, file = out);
-        sys.stdout.flush()
-        sys.stderr.flush()
-
-        return test_failed
+        try :
+                # print formated name
+                name_txt = "%20s  " % t.name
+
+                #run the test instance and collect the result
+                test_failed, error = run_single_test(t, generate, dry_run, debug)
+
+                # update output based on current action
+                if generate :
+                        failed_txt = "ERROR"
+                        success_txt = "Done"
+                else :
+                        failed_txt = "FAILED"
+                        success_txt = "PASSED"
+
+                #print result with error if needed
+                text = name_txt + (failed_txt if test_failed else success_txt)
+                out = sys.stdout
+                if error :
+                        text = text + "\n" + error
+                        out = sys.stderr
+
+                print(text, file = out);
+                sys.stdout.flush()
+                sys.stderr.flush()
+                return test_failed
+        
+        except KeyboardInterrupt:
+                test_failed = True
+
 
 # run the given list of tests with the given parameters
@@ -209 +213 @@
         pool = Pool(jobs)
         try :
-                results = pool.map_async(partial(run_test_instance, generate=generate, dry_run=dry_run, debug=debug), tests ).get(99999999)
+                results = pool.map_async(partial(run_test_instance, generate=generate, dry_run=dry_run, debug=debug), tests )
+                results.get(9999)
         except KeyboardInterrupt:
                 pool.terminate()