Changeset d65f92c for tests/pybin/settings.py

Timestamp:

Aug 15, 2019, 10:21:36 AM (7 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, stuck-waitfor-destruct

Children:

5c4a473

Parents:

1ee048fd

Message:

Tests almost work, the only issue left is using -E and -CFA together

File:

• tests/pybin/settings.py (modified) (5 diffs)

tests/pybin/settings.py

@@ -11 +11 @@
         SRCDIR = os.path.abspath(config.SRCDIR)
         BUILDDIR = os.path.abspath(config.BUILDDIR)
+        distribute = config.DISTRIBUTE
         os.chdir(testpath)
 
@@ -85 +86 @@
                 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):
+                if value:
+                        distribute = False
+
                 self.string = "installed" if value else "in-tree"
                 self.flags  = """INSTALL_FLAGS=%s""" % ("" if value else "-in-tree")
@@ -113 +118 @@
         global timeout
         global output_width
+        global distcc
 
         dry_run      = options.dry_run
@@ -122 +128 @@
         timeout      = Timeouts(options.timeout, options.global_timeout)
         output_width = 24
+        distcc       = "DISTCC_CFA_PATH=~/.cfadistcc/%s/cfa" % tools.config_hash()
 
+        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):
@@ -131 +140 @@
 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: