Changeset fc01219 for tests/pybin/settings.py

Timestamp:

Mar 7, 2022, 5:08:03 PM (13 months ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

enum, master, pthread-emulation, qualifiedEnum

Children:

ef56087

Parents:

d529ad0

Message:

fixed -j option in the test suite to behave like make's -j.
-j unlimited not supported yet.

File:

• tests/pybin/settings.py (modified) (3 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():