Changes in tests/pybin/tools.py [143e6f3:34e1494]

File:

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

tests/pybin/tools.py

@@ -23 +23 @@
 
 # helper functions to run terminal commands
-def sh(*cmd, timeout = False, output = None, input = None, error = subprocess.STDOUT):
+def sh(*cmd, timeout = False, output_file = None, input_file = None, input_text = None, error = subprocess.STDOUT, ignore_dry_run = False):
         cmd = list(cmd)
 
+        if input_file and input_text:
+                return 401, "Cannot use both text and file inputs"
+
         # if this is a dry_run, only print the commands that would be ran
-        if settings.dry_run :
+        if settings.dry_run and not ignore_dry_run:
                 cmd = "{} cmd: {}".format(os.getcwd(), ' '.join(cmd))
-                if output and not isinstance(output, int):
+                if output_file and not isinstance(output_file, int):
                         cmd += " > "
-                        cmd += output
+                        cmd += output_file
 
                 if error and not isinstance(error, int):
@@ -37 +40 @@
                         cmd += error
 
-                if input and not isinstance(input, int) and os.path.isfile(input):
+                if input_file and not isinstance(input_file, int) and os.path.isfile(input_file):
                         cmd += " < "
-                        cmd += input
+                        cmd += input_file
 
                 print(cmd)
@@ -46 +49 @@
         with contextlib.ExitStack() as onexit:
                 # add input redirection if needed
-                input = openfd(input, 'r', onexit, True)
+                input_file = openfd(input_file, 'r', onexit, True)
 
                 # add output redirection if needed
-                output = openfd(output, 'w', onexit, False)
+                output_file = openfd(output_file, 'w', onexit, False)
 
                 # add error redirection if needed
@@ -58 +61 @@
                         proc = subprocess.run(
                                 cmd,
-                                stdin =input,
-                                stdout=output,
-                                stderr=error,
-                                timeout=settings.timeout.single if timeout else None
+                                **({'input' : bytes(input_text, encoding='utf-8')} if input_text else {'stdin' : input_file}),
+                                stdout  = output_file,
+                                stderr  = error,
+                                timeout = settings.timeout.single if timeout else None
                         )
+
                         return proc.returncode, proc.stdout.decode("utf-8") if proc.stdout else None
                 except subprocess.TimeoutExpired:
@@ -75 +79 @@
                 return False
 
-        code, out = sh("file %s" % fname, output=subprocess.PIPE)
+        code, out = sh("file %s" % fname, output_file=subprocess.PIPE)
         if code != 0:
                 return False
@@ -107 +111 @@
         if isinstance(files, str ): files = [ files ]
         for file in files:
-                sh( 'rm', '-f', file, output=subprocess.DEVNULL, error=subprocess.DEVNULL )
+                sh( 'rm', '-f', file, output_file=subprocess.DEVNULL, error=subprocess.DEVNULL )
 
 # Create 1 or more directory
@@ -115 +119 @@
                 p = os.path.normpath( file )
                 d = os.path.dirname ( p )
-                sh( 'mkdir', '-p', d, output=subprocess.DEVNULL, error=subprocess.DEVNULL )
+                sh( 'mkdir', '-p', d, output_file=subprocess.DEVNULL, error=subprocess.DEVNULL )
 
 
@@ -138 +142 @@
                 lhs,
                 rhs,
-                output=subprocess.PIPE
+                output_file=subprocess.PIPE
         )
 
 # call make
-def make(target, *, flags = '', output = None, error = None, error_file = None, silent = False):
+def make(target, *, flags = '', output_file = None, error = None, error_file = None, silent = False):
         test_param = """test="%s" """ % (error_file) if error_file else None
         cmd = [
@@ -151 +155 @@
                 settings.debug.flags,
                 settings.install.flags,
+                settings.distcc if settings.distribute else None,
                 flags,
                 target
         ]
         cmd = [s for s in cmd if s]
-        return sh(*cmd, output=output, error=error)
+        return sh(*cmd, output_file=output_file, error=error)
 
 def which(program):
@@ -201 +206 @@
 # cat one file into the other
 def cat(source, dest):
-        ret, _ = sh("cat", source, output=dest)
+        ret, _ = sh("cat", source, output_file=dest)
         return ret
 
@@ -256 +261 @@
                         os.write(int(make_jobs_fds.group(3)), tokens)
                 else :
-                        options.jobs = multiprocessing.cpu_count()
+                        if settings.distribute:
+                                ret, jstr = sh("distcc", "-j", output_file=subprocess.PIPE, ignore_dry_run=True)
+                                if ret == 0:
+                                        options.jobs = int(jstr.strip())
+                                else :
+                                        options.jobs = multiprocessing.cpu_count()
+                        else:
+                                options.jobs = multiprocessing.cpu_count()
         else :
                 force = True
@@ -274 +286 @@
 ################################################################################
 
+# get hash for given configuration
+def config_hash():
+        path = os.path.normpath(os.path.join(
+                settings.SRCDIR,
+        ))
+
+        distcc_hash = os.path.join(settings.SRCDIR, '../tools/build/distcc_hash')
+        config = "%s-%s" % (settings.arch.target, settings.debug.path)
+        _, out = sh(distcc_hash, config, output_file=subprocess.PIPE, ignore_dry_run=True)
+        return out.strip()
+
+# get pretty string for time of day
 def pretty_now():
         ts = time.time()
@@ -308 +332 @@
                 return 1, "ERR No core dump"
 
-        return sh('gdb', '-n', path, core, '-batch', '-x', cmd, output=subprocess.PIPE)
+        return sh('gdb', '-n', path, core, '-batch', '-x', cmd, output_file=subprocess.PIPE)
 
 def core_archive(dst, name, exe):