Changeset ffec1bf for tests/pybin/tools.py

Timestamp:

Jul 25, 2022, 2:23:28 PM (3 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

4c48be0, 5cf1228, def751f

Parents:

9e23b446 (diff), 1f950c3b (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• tests/pybin/tools.py (modified) (2 diffs)

tests/pybin/tools.py

@@ -46 +46 @@
 
                         print(cmd)
-                        return 0, None
+                        return 0, None, None
 
                 with contextlib.ExitStack() as onexit:
@@ -291 +291 @@
 ################################################################################
 def jobserver_version():
-        make_ret, out, err = sh('make', '.test_makeflags', '-j2', output_file=subprocess.PIPE, error=subprocess.PIPE)
+        make_ret, out, err = sh('make', '.test_makeflags', '-j2', ignore_dry_run = True, output_file=subprocess.PIPE, error=subprocess.PIPE)
         if make_ret != 0:
                 print("ERROR: cannot find Makefile jobserver version", file=sys.stderr)