Changes in tests/pybin/settings.py [17bc05b:dcfedca]
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
tests/pybin/settings.py
r17bc05b rdcfedca 14 14 SRCDIR = os.path.abspath(config.SRCDIR) 15 15 BUILDDIR = os.path.abspath(config.BUILDDIR) 16 distribute = config.DISTRIBUTE17 16 os.chdir(testpath) 18 17 … … 89 88 self.string = "debug" if value else "no debug" 90 89 self.flags = """DEBUG_FLAGS=%s""" % ("-debug -O0" if value else "-nodebug -O2") 91 self.path = "debug" if value else "nodebug"92 90 93 91 class Install: 94 92 def __init__(self, value): 95 if value:96 distribute = False97 98 93 self.string = "installed" if value else "in-tree" 99 94 self.flags = """INSTALL_FLAGS=%s""" % ("" if value else "-in-tree") … … 114 109 def init( options ): 115 110 global arch 116 global archive117 global debug118 global distcc119 111 global dry_run 120 112 global generating 113 global make 114 global debug 121 115 global install 122 global make116 global timeout 123 117 global output_width 124 global timeout118 global archive 125 119 126 arch = Architecture(options.arch)127 archive = os.path.abspath(os.path.join(original_path, options.archive_errors)) if options.archive_errors else None128 debug = Debug(options.debug)129 distcc = "DISTCC_CFA_PATH=~/.cfadistcc/%s/cfa" % tools.config_hash()130 120 dry_run = options.dry_run 131 121 generating = options.regenerate_expected 122 make = ['make'] 123 debug = Debug(options.debug) 132 124 install = Install(options.install) 133 make = ['make'] 125 arch = Architecture(options.arch) 126 timeout = Timeouts(options.timeout, options.global_timeout) 134 127 output_width = 24 135 timeout = Timeouts(options.timeout, options.global_timeout)128 archive = os.path.abspath(os.path.join(original_path, options.archive_errors)) if options.archive_errors else None 136 129 137 # if we distribute, distcc errors will fail tests, use log file for distcc138 # don't use "'DISTCC_LOG' not in os.environ" because it can be set to ''139 if distribute and not os.environ.get('DISTCC_LOG'):140 os.putenv('DISTCC_LOG', os.path.join(BUILDDIR, 'distcc_error.log'))141 130 142 131 def update_make_cmd(force, jobs): … … 147 136 def validate(): 148 137 errf = os.path.join(BUILDDIR, ".validate.err") 149 make_ret, out = tools.make( ".validate", error_file = errf, output _file=subprocess.DEVNULL, error=subprocess.DEVNULL )138 make_ret, out = tools.make( ".validate", error_file = errf, output=subprocess.DEVNULL, error=subprocess.DEVNULL ) 150 139 if make_ret != 0: 151 140 with open (errf, "r") as myfile:
Note: See TracChangeset
for help on using the changeset viewer.