A couple small changes to get LIT working with python3

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@226330 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier 2015-01-16 21:59:07 +00:00
parent 28a058bd51
commit 33f50fb940
2 changed files with 2 additions and 2 deletions

View File

@ -25,7 +25,7 @@ class LibcxxTestFormat(lit.formats.FileBasedTest):
while True: while True:
try: try:
return self._execute(test, lit_config) return self._execute(test, lit_config)
except OSError, oe: except OSError as oe:
if oe.errno != errno.ETXTBSY: if oe.errno != errno.ETXTBSY:
raise raise
time.sleep(0.1) time.sleep(0.1)

View File

@ -49,7 +49,7 @@ if config.test_exec_root is None:
cfg_variant = getattr(config, 'configuration_variant', 'libcxx') cfg_variant = getattr(config, 'configuration_variant', 'libcxx')
if cfg_variant: if cfg_variant:
print 'Using configuration variant: %s' % cfg_variant lit_config.note('Using configuration variant: %s' % cfg_variant)
# Load the Configuration class from the module name <cfg_variant>.test.config. # Load the Configuration class from the module name <cfg_variant>.test.config.
config_module_name = '.'.join([cfg_variant, 'test', 'config']) config_module_name = '.'.join([cfg_variant, 'test', 'config'])