Changeset b1e63ac5 for src/tests/test.py

Timestamp:

Jul 4, 2017, 9:40:16 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

208e5be

Parents:

9c951e3 (diff), f7cb0bc (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 references

File:

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

src/tests/test.py

@@ -197 +197 @@
                         # fetch return code and error from the diff command
                         retcode, error = diff(".expect/%s.txt" % test.path, ".out/%s.log" % test.name, dry_run)
+
+        else:
+                with open (out_file, "r") as myfile:
+                        error = myfile.read()
+
+                
         # clean the executable
         sh("rm -f %s > /dev/null 2>&1" % test.name, dry_run)
@@ -253 +259 @@
         # for each test to run
         try :
-                results = pool.map_async(partial(run_test_worker, generate=generate, dry_run=dry_run, debug=debug), tests ).get(3600)
+                results = pool.map_async(partial(run_test_worker, generate=generate, dry_run=dry_run, debug=debug), tests, chunksize = 1 ).get(7200)
         except KeyboardInterrupt:
                 pool.terminate()