diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2016-03-23 18:46:57 +0000 |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2016-03-23 18:46:57 +0000 |
| commit | 25e5d6e7070354450e6e42ae8d5743a9754340bd (patch) | |
| tree | 8e93cbad73ce3292e86f9419bb72e915ff9c7dfc /test/Driver/cl-pch-showincludes.cpp | |
| parent | dbb97986fbe4d3f7b1589000fc0d42ffa2ee663f (diff) | |
| download | clang-25e5d6e7070354450e6e42ae8d5743a9754340bd.tar.gz | |
clang-cl: Fix remaining bugs in interaction of /Yc and /FI /showIncludes.
Instead of putting the /Yc header into ExtraDeps, give DependencyOutputOptions
a dedicated field for /Yc mode, and let HeaderIncludesCallback hang on to the
full DependencyOutputOptions object, not just ExtraDeps.
Reverts parts of r263352 that are now no longer needed.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@264182 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/Driver/cl-pch-showincludes.cpp')
| -rw-r--r-- | test/Driver/cl-pch-showincludes.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/test/Driver/cl-pch-showincludes.cpp b/test/Driver/cl-pch-showincludes.cpp index 76b7cd1a25..8115e6b5d3 100644 --- a/test/Driver/cl-pch-showincludes.cpp +++ b/test/Driver/cl-pch-showincludes.cpp @@ -11,8 +11,7 @@ // RUN: %clang_cl -Werror /showIncludes /I%S/Inputs /Ycheader2.h /FIheader2.h /Fp%t.pch /c /Fo%t -- %s \ // RUN: | FileCheck --strict-whitespace -check-prefix=CHECK-YC %s // CHECK-YC: Note: including file: {{[^ ]*header2.h}} -// FIXME: header1.h should be indented one more: -// CHECK-YC: Note: including file: {{[^ ]*header1.h}} +// CHECK-YC: Note: including file: {{[^ ]*header1.h}} // CHECK-YC: Note: including file: {{[^ ]*header3.h}} // When using the pch, only the direct include is printed. @@ -35,11 +34,9 @@ // /FI flags before the /Yc arg should be printed, /FI flags after it shouldn't. // RUN: %clang_cl -Werror /showIncludes /I%S/Inputs /Ycheader2.h /FIheader0.h /FIheader2.h /FIheader4.h /Fp%t.pch /c /Fo%t -- %s \ // RUN: | FileCheck --strict-whitespace -check-prefix=CHECK-YCFI %s -// FIXME: The order of the first two lines here must be reversed: -// CHECK-YCFI: Note: including file: {{[^ ]*header2.h}} // CHECK-YCFI: Note: including file: {{[^ ]*header0.h}} -// FIXME: header1.h should be indented one more: -// CHECK-YCFI: Note: including file: {{[^ ]*header1.h}} +// CHECK-YCFI: Note: including file: {{[^ ]*header2.h}} +// CHECK-YCFI: Note: including file: {{[^ ]*header1.h}} // CHECK-YCFI: Note: including file: {{[^ ]*header4.h}} // CHECK-YCFI: Note: including file: {{[^ ]*header3.h}} |