From 03f443ad1a74d291a2362ac338beb39b6eec9a38 Mon Sep 17 00:00:00 2001
From: Daniel Dunbar <daniel@zuster.org>
Date: Wed, 14 Aug 2013 16:32:20 +0000
Subject: [PATCH] [tests] Reapply r188354, ensure subsitution string is ascii.
- Now fixed to ensure substitution value isn't of unicode type on Python 2.6-7.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@188384 91177308-0d34-0410-b5e6-96231b3b80d8
---
test/lit.cfg | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/test/lit.cfg b/test/lit.cfg
index c198dfe568..d23a40c79b 100644
--- a/test/lit.cfg
+++ b/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,
--
2.40.0