Changeset 3d5701e for tests/pybin/settings.py

Timestamp:

Feb 25, 2020, 1:17:33 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

7dc2e015

Parents:

9fb8f01 (diff), dd9e1ca (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

@@ -14 +14 @@
         SRCDIR = os.path.abspath(config.SRCDIR)
         BUILDDIR = os.path.abspath(config.BUILDDIR)
+        distribute = config.DISTRIBUTE
         os.chdir(testpath)
 
@@ -88 +89 @@
                 self.string = "debug" if value else "no debug"
                 self.flags  = """DEBUG_FLAGS=%s""" % ("-debug -O0" if value else "-nodebug -O2")
+                self.path   = "debug" if value else "nodebug"
 
 class Install:
         def __init__(self, value):
-                self.string = "installed" if value else "in-tree"
-                self.flags  = """INSTALL_FLAGS=%s""" % ("" if value else "-in-tree")
+                if value:
+                        distribute = False
+
+                self.string = "installed" if value else "in tree"
+                self.flags  = """installed=%s""" % ("yes" if value else "no")
 
 class Timeouts:
@@ -109 +114 @@
 def init( options ):
         global arch
+        global archive
+        global debug
+        global distcc
         global dry_run
         global generating
+        global install
         global make
-        global debug
-        global install
+        global output_width
         global timeout
-        global output_width
-        global archive
 
-        dry_run      = options.dry_run
+        arch         = Architecture(options.arch)
+        archive      = os.path.abspath(os.path.join(original_path, options.archive_errors)) if options.archive_errors else None
+        debug        = Debug(options.debug)
+        dry_run      = options.dry_run # must be called before tools.config_hash()
+        distcc       = "DISTCC_CFA_PATH=~/.cfadistcc/%s/cfa" % tools.config_hash()
         generating   = options.regenerate_expected
+        install      = Install(options.install)
         make         = ['make']
-        debug        = Debug(options.debug)
-        install      = Install(options.install)
-        arch         = Architecture(options.arch)
+        output_width = 24
         timeout      = Timeouts(options.timeout, options.global_timeout)
-        output_width = 24
-        archive      = os.path.abspath(os.path.join(original_path, options.archive_errors)) if options.archive_errors else None
 
+        # if we distribute, distcc errors will fail tests, use log file for distcc
+        # don't use "'DISTCC_LOG' not in os.environ" because it can be set to ''
+        if distribute and not os.environ.get('DISTCC_LOG'):
+                os.putenv('DISTCC_LOG', os.path.join(BUILDDIR, 'distcc_error.log'))
 
 def update_make_cmd(force, jobs):
@@ -136 +147 @@
 def validate():
         errf = os.path.join(BUILDDIR, ".validate.err")
-        make_ret, out = tools.make( ".validate", error_file = errf, output=subprocess.DEVNULL, error=subprocess.DEVNULL )
+        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: