diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2013-08-14 16:32:20 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2013-08-14 16:32:20 +0000 |
| commit | eff4a95e4b23d084715812dec8fbc6cc0582032a (patch) | |
| tree | e4daba49d3a19b761fabf17ecce19847613f47f6 /clang | |
| parent | a6821921a7e5617f3792e8ea9f55704ac4f8fffa (diff) | |
| download | bcm5719-llvm-eff4a95e4b23d084715812dec8fbc6cc0582032a.tar.gz bcm5719-llvm-eff4a95e4b23d084715812dec8fbc6cc0582032a.zip | |
[tests] Reapply r188354, ensure subsitution string is ascii.
- Now fixed to ensure substitution value isn't of unicode type on Python 2.6-7.
llvm-svn: 188384
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/test/lit.cfg | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/test/lit.cfg b/clang/test/lit.cfg index c198dfe5687..d23a40c79b7 100644 --- a/clang/test/lit.cfg +++ b/clang/test/lit.cfg @@ -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, |
