[libcxx] r226330 - A couple small changes to get LIT working with python3

[Eric Fiselier]

Author: ericwf
Date: Fri Jan 16 15:59:07 2015
New Revision: 226330

URL: http://llvm.org/viewvc/llvm-project?rev=226330&view=rev
Log:
A couple small changes to get LIT working with python3

Modified:
    libcxx/trunk/test/libcxx/test/format.py
    libcxx/trunk/test/lit.cfg

Modified: libcxx/trunk/test/libcxx/test/format.py
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/test/format.py?rev=226330&r1=226329&r2=226330&view=diff
==============================================================================
--- libcxx/trunk/test/libcxx/test/format.py (original)
+++ libcxx/trunk/test/libcxx/test/format.py Fri Jan 16 15:59:07 2015
@@ -25,7 +25,7 @@ class LibcxxTestFormat(lit.formats.FileB
         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)

Modified: libcxx/trunk/test/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/lit.cfg?rev=226330&r1=226329&r2=226330&view=diff
==============================================================================
--- libcxx/trunk/test/lit.cfg (original)
+++ libcxx/trunk/test/lit.cfg Fri Jan 16 15:59:07 2015
@@ -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'])