make sure to always clean up the bjam xml file

This commit is contained in:
Arvid Norberg 2013-06-20 04:43:45 +00:00
parent a5926e5177
commit 67f631e44e
1 changed files with 60 additions and 58 deletions

View File

@ -80,6 +80,7 @@ def svn_info():
def run_tests(toolset, tests, features, options, test_dir, time_limit, incremental): def run_tests(toolset, tests, features, options, test_dir, time_limit, incremental):
xml_file = 'bjam_build.%d.xml' % random.randint(0, 100000) xml_file = 'bjam_build.%d.xml' % random.randint(0, 100000)
try:
results = {} results = {}
toolset_found = False toolset_found = False
@ -124,9 +125,6 @@ def run_tests(toolset, tests, features, options, test_dir, time_limit, increment
toolset = compiler + '-' + compiler_version toolset = compiler + '-' + compiler_version
except: pass except: pass
try: os.unlink(xml_file)
except: pass
r = { 'status': p.returncode, 'output': output, 'command': command } r = { 'status': p.returncode, 'output': output, 'command': command }
results[t + '|' + features] = r results[t + '|' + features] = r
@ -143,6 +141,10 @@ def run_tests(toolset, tests, features, options, test_dir, time_limit, increment
else: sys.stdout.write('X') else: sys.stdout.write('X')
sys.stdout.flush() sys.stdout.flush()
finally:
try: os.unlink(xml_file)
except: pass
return (toolset, results) return (toolset, results)
def print_usage(): def print_usage():