Changes in tests/pybin/settings.py [cc9b520:a2f2fda]

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