Author: ddunbar
Date: Wed Aug 14 11:32:20 2013
New Revision: 188384
URL: http://llvm.org/viewvc/llvm-project?rev=188384&view=rev
Log:
[tests] Reapply r188354, ensure subsitution string is ascii.
- Now fixed to ensure substitution value isn't of unicode type on Python 2.6-7.
Modified:
cfe/trunk/test/lit.cfg
Modified: cfe/trunk/test/lit.cfg
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/lit.cfg?rev=188384&r1=188383&r2=188384&view=diff
==============================================================================
--- cfe/trunk/test/lit.cfg (original)
+++ cfe/trunk/test/lit.cfg Wed Aug 14 11:32:20 2013
@@ -200,7 +200,8 @@ def getClangBuiltinIncludeDir(clang):
if sys.platform in ['win32'] and execute_external:
# Don't pass dosish path separator to msys bash.exe.
dir = dir.replace('\\', '/')
- return dir
+ # Ensure the result is an ascii string, across Python2.5+ - Python3.
+ return str(dir.decode('ascii'))
config.substitutions.append( ('%clang_cc1', '%s -cc1 -internal-isystem %s'
% (config.clang,
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
