From 33f50fb94076ee603c77449277c16669c7903445 Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Fri, 16 Jan 2015 21:59:07 +0000 Subject: [PATCH] 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 --- test/libcxx/test/format.py | 2 +- test/lit.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/libcxx/test/format.py b/test/libcxx/test/format.py index 10712f94..e162e1f7 100644 --- a/test/libcxx/test/format.py +++ b/test/libcxx/test/format.py @@ -25,7 +25,7 @@ class LibcxxTestFormat(lit.formats.FileBasedTest): while True: try: return self._execute(test, lit_config) - except OSError, oe: + except OSError as oe: if oe.errno != errno.ETXTBSY: raise time.sleep(0.1) diff --git a/test/lit.cfg b/test/lit.cfg index 6f536386..c487cf36 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -49,7 +49,7 @@ if config.test_exec_root is None: cfg_variant = getattr(config, 'configuration_variant', 'libcxx') 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 .test.config. config_module_name = '.'.join([cfg_variant, 'test', 'config'])