diff options
| author | Alex Lorenz <arphaman@gmail.com> | 2019-08-31 01:26:04 +0000 |
|---|---|---|
| committer | Alex Lorenz <arphaman@gmail.com> | 2019-08-31 01:26:04 +0000 |
| commit | 0377ca641c9af0262270d091578cab19523b1bc6 (patch) | |
| tree | 07dd78901eff6d926370fdd5414576a90fdfd40e /clang/test/ClangScanDeps | |
| parent | 09490012afde4ef89165f42d143e18a81e7a1054 (diff) | |
| download | bcm5719-llvm-0377ca641c9af0262270d091578cab19523b1bc6.tar.gz bcm5719-llvm-0377ca641c9af0262270d091578cab19523b1bc6.zip | |
Introduce a DirectoryEntryRef that stores both a reference and an
accessed name to the directory entry
This commit introduces a parallel API that returns a DirectoryEntryRef
to the FileManager, similar to the parallel FileEntryRef API. All
uses will have to be update in follow-up patches. The immediate use of the new API in this
patch fixes the issue where a file manager was reused in clang-scan-deps,
but reported an different file path whenever a framework lookup was done through a symlink.
Differential Revision: https://reviews.llvm.org/D67026
llvm-svn: 370562
Diffstat (limited to 'clang/test/ClangScanDeps')
| -rw-r--r-- | clang/test/ClangScanDeps/Inputs/subframework_header_dir_symlink_cdb.json | 2 | ||||
| -rw-r--r-- | clang/test/ClangScanDeps/subframework_header_dir_symlink.m | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/clang/test/ClangScanDeps/Inputs/subframework_header_dir_symlink_cdb.json b/clang/test/ClangScanDeps/Inputs/subframework_header_dir_symlink_cdb.json index a405c6b3af1..8daeff1759a 100644 --- a/clang/test/ClangScanDeps/Inputs/subframework_header_dir_symlink_cdb.json +++ b/clang/test/ClangScanDeps/Inputs/subframework_header_dir_symlink_cdb.json @@ -6,7 +6,7 @@ }, { "directory": "DIR", - "command": "clang -E DIR/subframework_header_dir_symlink2.m -FInputs/frameworks_symlink -iframework Inputs/frameworks", + "command": "clang -E DIR/subframework_header_dir_symlink2.m -FInputs/frameworks -iframework Inputs/frameworks_symlink", "file": "DIR/subframework_header_dir_symlink2.m" } ] diff --git a/clang/test/ClangScanDeps/subframework_header_dir_symlink.m b/clang/test/ClangScanDeps/subframework_header_dir_symlink.m index 5cc17851e7c..ae7f884803f 100644 --- a/clang/test/ClangScanDeps/subframework_header_dir_symlink.m +++ b/clang/test/ClangScanDeps/subframework_header_dir_symlink.m @@ -10,9 +10,8 @@ // RUN: sed -e "s|DIR|%/t.dir|g" %S/Inputs/subframework_header_dir_symlink_cdb.json > %t.cdb // RUN: clang-scan-deps -compilation-database %t.cdb -j 1 -reuse-filemanager=0 | \ // RUN: FileCheck %s -// FIXME: Make this work when the filemanager is reused: // RUN: clang-scan-deps -compilation-database %t.cdb -j 1 -reuse-filemanager=1 | \ -// RUN: not FileCheck %s +// RUN: FileCheck %s #ifndef EMPTY #include "Framework/Framework.h" |
