forked from premiere/premiere-libtorrent
fix bug in run_tests.py
This commit is contained in:
parent
68f9a84b3b
commit
424040a10b
|
@ -98,29 +98,28 @@ def run_tests(toolset, tests, features, options, test_dir):
|
||||||
# parse out the toolset version from the xml file
|
# parse out the toolset version from the xml file
|
||||||
compiler = ''
|
compiler = ''
|
||||||
compiler_version = ''
|
compiler_version = ''
|
||||||
|
command = ''
|
||||||
|
|
||||||
# make this parse the actual test to pick up the time
|
# make this parse the actual test to pick up the time
|
||||||
# spent runnin the test
|
# spent runnin the test
|
||||||
if not toolset_found:
|
try:
|
||||||
try:
|
dom = et.parse(xml_file)
|
||||||
dom = et.parse(xml_file)
|
|
||||||
|
|
||||||
command = dom.find('./command').text
|
command = dom.find('./command').text
|
||||||
|
|
||||||
prop = dom.findall('./action/properties/property')
|
prop = dom.findall('./action/properties/property')
|
||||||
for a in prop:
|
for a in prop:
|
||||||
name = a.attrib['name']
|
name = a.attrib['name']
|
||||||
if name == 'toolset':
|
if name == 'toolset':
|
||||||
compiler = a.text
|
compiler = a.text
|
||||||
if compiler_version != '': break
|
if compiler_version != '': break
|
||||||
if name.startswith('toolset-') and name.endswith(':version'):
|
if name.startswith('toolset-') and name.endswith(':version'):
|
||||||
compiler_version = a.text
|
compiler_version = a.text
|
||||||
if compiler != '': break
|
if compiler != '': break
|
||||||
|
|
||||||
if compiler != '' and compiler_version != '':
|
if compiler != '' and compiler_version != '':
|
||||||
toolset = compiler + '-' + compiler_version
|
toolset = compiler + '-' + compiler_version
|
||||||
toolset_found = True
|
except: pass
|
||||||
except: pass
|
|
||||||
|
|
||||||
try: os.unlink(xml_file)
|
try: os.unlink(xml_file)
|
||||||
except: pass
|
except: pass
|
||||||
|
|
Loading…
Reference in New Issue