[libcxx] r216314 - Fix handling of format strings to work with python 2.6

Eric Fiselier eric at efcs.ca
Fri Aug 22 21:02:21 PDT 2014


Author: ericwf
Date: Fri Aug 22 23:02:21 2014
New Revision: 216314

URL: http://llvm.org/viewvc/llvm-project?rev=216314&view=rev
Log:
Fix handling of format strings to work with python 2.6

Modified:
    libcxx/trunk/test/lit.cfg

Modified: libcxx/trunk/test/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/lit.cfg?rev=216314&r1=216313&r2=216314&view=diff
==============================================================================
--- libcxx/trunk/test/lit.cfg (original)
+++ libcxx/trunk/test/lit.cfg Fri Aug 22 23:02:21 2014
@@ -307,9 +307,9 @@ class Configuration(object):
         for feature, loc in locales[platform.system()].items():
             try:
                 locale.setlocale(locale.LC_ALL, loc)
-                self.config.available_features.add('locale.{}'.format(feature))
+                self.config.available_features.add('locale.{0}'.format(feature))
             except:
-                self.lit_config.warning('The locale {} is not supported by '
+                self.lit_config.warning('The locale {0} is not supported by '
                                         'your platform. Some tests will be '
                                         'unsupported.'.format(loc))
         locale.setlocale(locale.LC_ALL, default_locale)
@@ -384,7 +384,7 @@ class Configuration(object):
         if std is None:
             std = 'c++11'
             self.lit_config.note('using default std: \'-std=c++11\'')
-        self.compile_flags += ['-std={}'.format(std)]
+        self.compile_flags += ['-std={0}'.format(std)]
         self.config.available_features.add(std)
 
     def configure_sanitizer(self):
@@ -401,7 +401,7 @@ class Configuration(object):
                 self.config.available_features.add('msan')
             else:
                 self.lit_config.fatal('unsupported value for '
-                                      'libcxx_use_san: {}'.format(san))
+                                      'libcxx_use_san: {0}'.format(san))
 
     def configure_triple(self):
         # Get or infer the target triple.





More information about the cfe-commits mailing list