Changeset 6daaee3


Ignore:
Timestamp:
Aug 15, 2019, 10:35:13 AM (2 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
arm-eh, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr
Children:
17bc05b
Parents:
5c4a473
Message:

Fixed incorrect merge

File:
1 edited

Legend:

Unmodified
Added
Removed
  • tests/pybin/settings.py

    r5c4a473 r6daaee3  
    114114def init( options ):
    115115        global arch
     116        global archive
     117        global debug
     118        global distcc
    116119        global dry_run
    117120        global generating
     121        global install
    118122        global make
    119         global debug
    120         global install
     123        global output_width
    121124        global timeout
    122         global output_width
    123 <<<<<<< HEAD
    124         global distcc
    125 =======
    126         global archive
    127 >>>>>>> master
    128125
     126        arch         = Architecture(options.arch)
     127        archive      = os.path.abspath(os.path.join(original_path, options.archive_errors)) if options.archive_errors else None
     128        debug        = Debug(options.debug)
     129        distcc       = "DISTCC_CFA_PATH=~/.cfadistcc/%s/cfa" % tools.config_hash()
    129130        dry_run      = options.dry_run
    130131        generating   = options.regenerate_expected
     132        install      = Install(options.install)
    131133        make         = ['make']
    132         debug        = Debug(options.debug)
    133         install      = Install(options.install)
    134         arch         = Architecture(options.arch)
     134        output_width = 24
    135135        timeout      = Timeouts(options.timeout, options.global_timeout)
    136         output_width = 24
    137 <<<<<<< HEAD
    138         distcc       = "DISTCC_CFA_PATH=~/.cfadistcc/%s/cfa" % tools.config_hash()
    139 =======
    140         archive      = os.path.abspath(os.path.join(original_path, options.archive_errors)) if options.archive_errors else None
    141 >>>>>>> master
    142136
    143137        if distribute and not os.environ.get('DISTCC_LOG'):
Note: See TracChangeset for help on using the changeset viewer.