diff options
| author | Eric Fiselier <eric@efcs.ca> | 2015-01-16 21:59:07 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2015-01-16 21:59:07 +0000 |
| commit | 7b269d0af5d577feeb3f5bcd7ee1102c0986f79e (patch) | |
| tree | f7e9bb2d43b034dfc57e9943ee5481ed381323c3 | |
| parent | c3abf062a18107fe90b301f743431fbf7dd78823 (diff) | |
| download | bcm5719-llvm-7b269d0af5d577feeb3f5bcd7ee1102c0986f79e.tar.gz bcm5719-llvm-7b269d0af5d577feeb3f5bcd7ee1102c0986f79e.zip | |
A couple small changes to get LIT working with python3
llvm-svn: 226330
| -rw-r--r-- | libcxx/test/libcxx/test/format.py | 2 | ||||
| -rw-r--r-- | libcxx/test/lit.cfg | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/test/libcxx/test/format.py b/libcxx/test/libcxx/test/format.py index 10712f940fe..e162e1f7268 100644 --- a/libcxx/test/libcxx/test/format.py +++ b/libcxx/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/libcxx/test/lit.cfg b/libcxx/test/lit.cfg index 6f536386e21..c487cf36d3c 100644 --- a/libcxx/test/lit.cfg +++ b/libcxx/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 <cfg_variant>.test.config. config_module_name = '.'.join([cfg_variant, 'test', 'config']) |
