Changes in tests/pybin/settings.py [abec2f8:dcfedca]

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)
 
@@ -89 +88 @@
                 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  = """installed=%s""" % ("yes" if value else "no")
+                self.string = "installed" if value else "in-tree"
+                self.flags  = """INSTALL_FLAGS=%s""" % ("" if value else "-in-tree")
 
 class Timeouts:
@@ -114 +109 @@
 def init( options ):
         global arch
-        global archive
-        global debug
-        global distcc
         global dry_run
         global generating
+        global make
+        global debug
         global install
-        global make
+        global timeout
         global output_width
-        global timeout
+        global archive
 
+        dry_run      = options.dry_run
+        generating   = options.regenerate_expected
+        make         = ['make']
+        debug        = Debug(options.debug)
+        install      = Install(options.install)
         arch         = Architecture(options.arch)
+        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
-        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']
-        output_width = 24
-        timeout      = Timeouts(options.timeout, options.global_timeout)
 
-        # 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):
@@ -147 +136 @@
 def validate():
         errf = os.path.join(BUILDDIR, ".validate.err")
-        make_ret, out = tools.make( ".validate", error_file = errf, output_file=subprocess.DEVNULL, error=subprocess.DEVNULL )
+        make_ret, out = tools.make( ".validate", error_file = errf, output=subprocess.DEVNULL, error=subprocess.DEVNULL )
         if make_ret != 0:
                 with open (errf, "r") as myfile: