diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2012-03-19 15:00:03 +0000 |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2012-03-19 15:00:03 +0000 |
| commit | 8935578528f6ba085064f6570784d544501e5737 (patch) | |
| tree | 68764503b74536b95abe214bd83ec9e0fd44ef64 /clang/test/Driver/cpath.c | |
| parent | 48ccc4df0bc3c4892bb292ba9d0ae2f09d4a7b3d (diff) | |
| download | bcm5719-llvm-8935578528f6ba085064f6570784d544501e5737.tar.gz bcm5719-llvm-8935578528f6ba085064f6570784d544501e5737.zip | |
Fix a regression where ':' in CPLUS_INCLUDE_PATH and friends would no longer separate paths.
This regressed in r152583. Also add a test to make sure it doesn't regress again.
llvm-svn: 153034
Diffstat (limited to 'clang/test/Driver/cpath.c')
| -rw-r--r-- | clang/test/Driver/cpath.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/clang/test/Driver/cpath.c b/clang/test/Driver/cpath.c index 7caa014b2af..5b3a94a3391 100644 --- a/clang/test/Driver/cpath.c +++ b/clang/test/Driver/cpath.c @@ -1,20 +1,22 @@ -// RUN: mkdir -p %T/test1 %T/test2 +// RUN: mkdir -p %T/test1 %T/test2 %T/test3 -// RUN: env CPATH=%T/test1 %clang -x c -E -v %s 2>&1 | FileCheck %s -check-prefix=CPATH +// RUN: env CPATH=%T/test1:%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 OBJCPLUS_INCLUDE_PATH=%T/test1 CPLUS_INCLUDE_PATH=%T/test1 C_INCLUDE_PATH=%T/test2 %clang -x c -E -v %s 2>&1 | FileCheck %s -check-prefix=C_INCLUDE_PATH -// C_INCLUDE_PATH: -c-isystem {{"?.*}}/test2{{"?}} -cxx-isystem {{"?.*}}/test1{{"?}} -objc-isystem {{"?.*}}/test1{{"?}} -objcxx-isystem {{"?.*}}/test1{{"?}} +// 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 +// 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 -// C_INCLUDE_PATH: test2 +// C_INCLUDE_PATH: test3 // C_INCLUDE_PATH-NOT: test1 -// RUN: env OBJC_INCLUDE_PATH=%T/test1 OBJCPLUS_INCLUDE_PATH=%T/test2 CPLUS_INCLUDE_PATH=%T/test2 C_INCLUDE_PATH=%T/test1 %clang -x objective-c++ -E -v %s 2>&1 | FileCheck %s -check-prefix=OBJCPLUS_INCLUDE_PATH -// OBJCPLUS_INCLUDE_PATH: -c-isystem {{"?.*}}/test1{{"?}} -cxx-isystem {{"?.*}}/test2{{"?}} -objc-isystem {{"?.*}}/test1{{"?}} -objcxx-isystem {{"?.*}}/test2{{"?}} +// RUN: env OBJC_INCLUDE_PATH=%T/test1 OBJCPLUS_INCLUDE_PATH=%T/test3 CPLUS_INCLUDE_PATH=%T/test3 C_INCLUDE_PATH=%T/test1 %clang -x objective-c++ -E -v %s 2>&1 | FileCheck %s -check-prefix=OBJCPLUS_INCLUDE_PATH +// OBJCPLUS_INCLUDE_PATH: -c-isystem {{"?.*}}/test1{{"?}} -cxx-isystem {{"?.*}}/test3{{"?}} -objc-isystem {{"?.*}}/test1{{"?}} -objcxx-isystem {{"?.*}}/test3{{"?}} // OBJCPLUS_INCLUDE_PATH: search starts here // OBJCPLUS_INCLUDE_PATH-NOT: test1 -// OBJCPLUS_INCLUDE_PATH: test2 +// OBJCPLUS_INCLUDE_PATH: test3 // OBJCPLUS_INCLUDE_PATH-NOT: test1 |
