Changeset 92538ab for tests/pybin/settings.py

Timestamp:

Apr 10, 2022, 2:53:18 PM (3 years ago)

Author:

JiadaL <j82liang@…>

Branches:

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

Children:

d8e2a09

Parents:

4559b34 (diff), 6256891 (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:

Resolve conflict

File:

• tests/pybin/settings.py (modified) (4 diffs)

tests/pybin/settings.py

@@ -155 +155 @@
         global generating
         global make
+        global make_jobfds
         global output_width
         global timeout
@@ -168 +169 @@
         generating   = options.regenerate_expected
         make         = ['make']
+        make_jobfds  = []
         output_width = 24
         timeout      = Timeouts(options.timeout, options.global_timeout)
@@ -177 +179 @@
                 os.putenv('DISTCC_LOG', os.path.join(BUILDDIR, 'distcc_error.log'))
 
-def update_make_cmd(force, jobs):
+def update_make_cmd(flags):
         global make
-
-        make = ['make'] if not force else ['make', "-j%i" % jobs]
+        make = ['make', *flags]
+
+def update_make_fds(r, w):
+        global make_jobfds
+        make_jobfds = (r, w)
 
 def validate():
@@ -187 +192 @@
         global distcc
         distcc       = "DISTCC_CFA_PATH=~/.cfadistcc/%s/cfa" % tools.config_hash()
-        errf = os.path.join(BUILDDIR, ".validate.err")
-        make_ret, out = tools.make( ".validate", error_file = errf, output_file=subprocess.DEVNULL, error=subprocess.DEVNULL )
+        make_ret, out, err = tools.make( ".validate", output_file=subprocess.PIPE, error=subprocess.PIPE )
         if make_ret != 0:
-                with open (errf, "r") as myfile:
-                        error=myfile.read()
                 print("ERROR: Invalid configuration %s:%s" % (arch.string, debug.string), file=sys.stderr)
-                print("       verify returned : \n%s" % error, file=sys.stderr)
-                tools.rm(errf)
+                print("       verify returned : \n%s" % err, file=sys.stderr)
                 sys.exit(1)
-
-        tools.rm(errf)
 
 def prep_output(tests):