Changeset 5c4a473 for tests/pybin/settings.py

Timestamp:

Aug 15, 2019, 10:31:53 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:

6daaee3

Parents:

d65f92c (diff), 3c7f01b (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:

Merge branch 'master' into distcc

File:

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

tests/pybin/settings.py

@@ -4 +4 @@
 from . import tools
 
+global original_path
+
 try :
+        original_path = os.getcwd()
         testpath = os.path.dirname(os.path.abspath(os.path.join(os.getcwd(), sys.argv[0])))
         sys.path.append(testpath)
@@ -118 +121 @@
         global timeout
         global output_width
+<<<<<<< HEAD
         global distcc
+=======
+        global archive
+>>>>>>> master
 
         dry_run      = options.dry_run
@@ -128 +135 @@
         timeout      = Timeouts(options.timeout, options.global_timeout)
         output_width = 24
+<<<<<<< HEAD
         distcc       = "DISTCC_CFA_PATH=~/.cfadistcc/%s/cfa" % tools.config_hash()
+=======
+        archive      = os.path.abspath(os.path.join(original_path, options.archive_errors)) if options.archive_errors else None
+>>>>>>> master
 
         if distribute and not os.environ.get('DISTCC_LOG'):