Changeset 6daaee3 for tests

Timestamp:

Aug 15, 2019, 10:35:13 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:

17bc05b

Parents:

5c4a473

Message:

Fixed incorrect merge

File:

• tests/pybin/settings.py (modified) (1 diff)

tests/pybin/settings.py

@@ -114 +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
-<<<<<<< HEAD
-        global distcc
-=======
-        global archive
->>>>>>> master
 
+        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)
+        distcc       = "DISTCC_CFA_PATH=~/.cfadistcc/%s/cfa" % tools.config_hash()
         dry_run      = options.dry_run
         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
-<<<<<<< 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'):