Changeset eea20cd for tests/pybin/tools.py

Timestamp:

Sep 12, 2019, 11:00:28 AM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

31d8f4d

Parents:

6716d78

Message:

Fixed git hash in python script with dry-run enabled

File:

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

tests/pybin/tools.py

@@ -23 +23 @@
 
 # helper functions to run terminal commands
-def sh(*cmd, timeout = False, output_file = None, input_file = None, input_text = 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)
 
@@ -30 +30 @@
 
         # 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_file and not isinstance(output_file, int):
@@ -287 +287 @@
         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)
+        _, out = sh(distcc_hash, config, output_file=subprocess.PIPE, ignore_dry_run=True)
         return out.strip()