Try to get cpath.c passing on windows, using lit's new ${pathsep} variable.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@153214 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/Driver/cpath.c b/test/Driver/cpath.c
index 8fb8a270733d61967de04453df72610d8120ce3c..5165542f02d57df78c3917a639da6ea621a4d94d 100644 (file)
--- a/test/Driver/cpath.c
+++ b/test/Driver/cpath.c
@@ -1,16 +1,13 @@
 // RUN: mkdir -p %T/test1 %T/test2 %T/test3
 
-// This could pass on Win32 if separator in pathenv were not ':' but ';'.
-// XFAIL: mingw32,win32
-
-// RUN: env CPATH=%T/test1:%T/test2 %clang -x c -E -v %s 2>&1 | FileCheck %s -check-prefix=CPATH
+// RUN: env CPATH=%T/test1%{pathsep}%T/test2 %clang -x c -E -v %s 2>&1 | FileCheck %s -check-prefix=CPATH
 // CPATH: -I {{.*}}/test1
 // CPATH: -I {{.*}}/test2
 // CPATH: search starts here
 // CPATH: test1
 // CPATH: test2
 
-// RUN: env OBJC_INCLUDE_PATH=%T/test1:%T/test2  OBJCPLUS_INCLUDE_PATH=%T/test1  CPLUS_INCLUDE_PATH=%T/test1:%t/test2 C_INCLUDE_PATH=%T/test3 %clang -x c -E -v %s 2>&1 | FileCheck %s -check-prefix=C_INCLUDE_PATH
+// RUN: env OBJC_INCLUDE_PATH=%T/test1%{pathsep}%T/test2  OBJCPLUS_INCLUDE_PATH=%T/test1  CPLUS_INCLUDE_PATH=%T/test1%{pathsep}%t/test2 C_INCLUDE_PATH=%T/test3 %clang -x c -E -v %s 2>&1 | FileCheck %s -check-prefix=C_INCLUDE_PATH
 // C_INCLUDE_PATH: -c-isystem {{"?.*}}/test3{{"?}} -cxx-isystem {{"?.*}}/test1{{"?}} -cxx-isystem {{"?.*}}/test2{{"?}} -objc-isystem {{"?.*}}/test1{{"?}} -objc-isystem {{"?.*}}/test2{{"?}} -objcxx-isystem {{"?.*}}/test1{{"?}}
 // C_INCLUDE_PATH: search starts here
 // C_INCLUDE_PATH-NOT: test1