Skip to content

Commit 0cbdb4b

Browse files
hjyamauchihjyamauchi
committed
Fix the following CAS-related tests on Windows (#11291)
Clang :: ClangScanDeps/cas-trees.c Clang :: ClangScanDeps/modules-availability-check.c Clang :: ClangScanDeps/modules-cas-fs-vfsoverlay.c Clang :: ClangScanDeps/modules-cas-implicit-module-cache.c Clang :: ClangScanDeps/modules-cas-trees-cwd.c Clang :: ClangScanDeps/modules-cas-trees-input-files.c Clang :: ClangScanDeps/modules-cas-trees-with-pch.c Clang :: ClangScanDeps/modules-cas-trees.c (Cherry picked from commit bce8dbd)
1 parent 9b631db commit 0cbdb4b

File tree

7 files changed

+139
-103
lines changed

7 files changed

+139
-103
lines changed

‎clang/test/ClangScanDeps/cas-trees.c‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
// RUN: clang-scan-deps -compilation-database %t/cdb.json -cas-path %t/cas -format experimental-tree -mode preprocess-dependency-directives > %t/result1.txt
77
// RUN: clang-scan-deps -compilation-database %t/cdb.json -cas-path %t/cas -format experimental-tree -mode preprocess > %t/result2.txt
88
// RUN: diff -u %t/result1.txt %t/result2.txt
9-
// RUN: FileCheck %s -input-file %t/result1.txt -DPREFIX=%/t
9+
// RUN: cat %t/result1.txt | %PathSanitizingFileCheck --sanitize PREFIX=%/t %s
1010

11-
// CHECK: tree {{.*}} for '[[PREFIX]]/t1.c'
12-
// CHECK-NEXT: tree {{.*}} for '[[PREFIX]]/t2.c'
11+
// CHECK: tree {{.*}} for 'PREFIX{{/|\\}}t1.c'
12+
// CHECK-NEXT: tree {{.*}} for 'PREFIX{{/|\\}}t2.c'
1313

1414
// RUN: clang-scan-deps -compilation-database %t/cdb.json -cas-path %t/cas -format experimental-tree-full -mode preprocess > %t/full_result.json
15-
// RUN: cat %t/full_result.json | FileCheck %s -DPREFIX=%/t --check-prefix=FULL-TREE
15+
// RUN: cat %t/full_result.json | %PathSanitizingFileCheck --sanitize PREFIX=%/t --enable-yaml-compatibility %s --check-prefix=FULL-TREE
1616

1717
// FULL-TREE: {
1818
// FULL-TREE-NEXT: "modules": [],
@@ -24,17 +24,17 @@
2424
// FULL-TREE-NEXT: "clang-module-deps": [],
2525
// FULL-TREE-NEXT: "command-line": [
2626
// FULL-TREE: "-fcas-path"
27-
// FULL-TREE-NEXT: "[[PREFIX]]{{.}}cas"
27+
// FULL-TREE-NEXT: "PREFIX{{/|\\\\}}cas"
2828
// FULL-TREE: "-fcas-fs"
2929
// FULL-TREE-NEXT: "[[T1_ROOT_ID]]"
3030
// FULL-TREE: "-fcache-compile-job"
3131
// FULL-TREE: ],
3232
// FULL-TREE: "file-deps": [
33-
// FULL-TREE-NEXT: "[[PREFIX]]/t1.c",
34-
// FULL-TREE-NEXT: "[[PREFIX]]/top.h",
35-
// FULL-TREE-NEXT: "[[PREFIX]]/n1.h"
33+
// FULL-TREE-NEXT: "PREFIX{{/|\\\\}}t1.c",
34+
// FULL-TREE-NEXT: "PREFIX{{/|\\\\}}top.h",
35+
// FULL-TREE-NEXT: "PREFIX{{/|\\\\}}n1.h"
3636
// FULL-TREE-NEXT: ],
37-
// FULL-TREE-NEXT: "input-file": "[[PREFIX]]/t1.c"
37+
// FULL-TREE-NEXT: "input-file": "PREFIX{{/|\\\\}}t1.c"
3838
// FULL-TREE-NEXT: }
3939
// FULL-TREE: {
4040
// FULL-TREE: "cache-key": "[[T2_CACHE_KEY:llvmcas://[[:xdigit:]]+]]"
@@ -43,16 +43,16 @@
4343
// FULL-TREE-NEXT: "clang-module-deps": [],
4444
// FULL-TREE-NEXT: "command-line": [
4545
// FULL-TREE: "-fcas-path"
46-
// FULL-TREE-NEXT: "[[PREFIX]]{{.}}cas"
46+
// FULL-TREE-NEXT: "PREFIX{{/|\\\\}}cas"
4747
// FULL-TREE: "-fcas-fs"
4848
// FULL-TREE-NEXT: "[[T2_ROOT_ID]]"
4949
// FULL-TREE: "-fcache-compile-job"
5050
// FULL-TREE: ],
5151
// FULL-TREE: "file-deps": [
52-
// FULL-TREE-NEXT: "[[PREFIX]]/t2.c",
53-
// FULL-TREE-NEXT: "[[PREFIX]]/n1.h"
52+
// FULL-TREE-NEXT: "PREFIX{{/|\\\\}}t2.c",
53+
// FULL-TREE-NEXT: "PREFIX{{/|\\\\}}n1.h"
5454
// FULL-TREE-NEXT: ],
55-
// FULL-TREE-NEXT: "input-file": "[[PREFIX]]/t2.c"
55+
// FULL-TREE-NEXT: "input-file": "PREFIX{{/|\\\\}}t2.c"
5656
// FULL-TREE-NEXT: }
5757

5858
// Build with caching
@@ -83,20 +83,20 @@
8383
// COMBINED: remark: compile job cache miss for '[[T1_CACHE_KEY]]'
8484
// COMBINED-NEXT: remark: compile job cache miss for '[[T2_CACHE_KEY]]'
8585

86-
// RUN: clang-scan-deps -compilation-database %t/cdb.json -cas-path %t/cas -format experimental-tree -emit-cas-compdb | FileCheck %s -DPREFIX=%/t -DCLANG=%clang -check-prefix=COMPDB
86+
// RUN: clang-scan-deps -compilation-database %t/cdb.json -cas-path %t/cas -format experimental-tree -emit-cas-compdb | %PathSanitizingFileCheck --sanitize PREFIX=%/t --sanitize CLANG=%/clang --enable-yaml-compatibility %s -check-prefix=COMPDB
8787
// COMPDB: [
8888
// COMPDB: {
89-
// COMPDB: "file": "[[PREFIX]]/t1.c",
90-
// COMPDB: "directory": "[[PREFIX]]",
89+
// COMPDB: "file": "PREFIX{{/|\\\\}}t1.c",
90+
// COMPDB: "directory": "PREFIX",
9191
// COMPDB: "arguments": [
92-
// COMPDB: "[[CLANG]]",
92+
// COMPDB: "CLANG",
9393
// COMPDB: "-cc1",
9494
// COMPDB: "-fcas-path",
95-
// COMPDB: "[[PREFIX]]/cas",
95+
// COMPDB: "PREFIX{{/|\\\\}}cas",
9696
// COMPDB: "-fcas-fs",
9797
// COMPDB: {
98-
// COMPDB: "file": "[[PREFIX]]/t2.c",
99-
// COMPDB: "directory": "[[PREFIX]]",
98+
// COMPDB: "file": "PREFIX{{/|\\\\}}t2.c",
99+
// COMPDB: "directory": "PREFIX",
100100
// COMPDB: "arguments": [
101101

102102

‎clang/test/ClangScanDeps/modules-cas-trees-cwd.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
// RUN: %clang @%t/tu.rsp
2323

2424
// Check specifics of the command-line
25-
// RUN: cat %t/deps.json | FileCheck %s -DPREFIX=%/t
25+
// RUN: cat %t/deps.json | %PathSanitizingFileCheck --sanitize PREFIX=%/t --enable-yaml-compatibility %s
2626

2727
// CHECK: {
2828
// CHECK-NEXT: "modules": [
2929
// CHECK-NEXT: {
3030
// CHECK: "command-line": [
3131
// CHECK: "-fcas-fs-working-directory"
32-
// CHECK-NEXT: "[[PREFIX]]/B"
32+
// CHECK-NEXT: "PREFIX{{/|\\\\}}B"
3333
// CHECK: ]
3434
// CHECK: "name": "Mod"
3535
// CHECK: }
@@ -40,7 +40,7 @@
4040
// CHECK: {
4141
// CHECK: "command-line": [
4242
// CHECK: "-fcas-fs-working-directory"
43-
// CHECK-NEXT: "[[PREFIX]]/B"
43+
// CHECK-NEXT: "PREFIX{{/|\\\\}}B"
4444
// CHECK: ]
4545

4646
//--- cdb.json.template

‎clang/test/ClangScanDeps/modules-cas-trees-with-pch.c‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// RUN: > %t/deps_pch.json
1616

1717
// == Check specifics of the command-line
18-
// RUN: cat %t/deps_pch.json | FileCheck %s -DPREFIX=%/t -check-prefix=PCH
18+
// RUN: cat %t/deps_pch.json | %PathSanitizingFileCheck --sanitize PREFIX=%/t --enable-yaml-compatibility %s -check-prefix=PCH
1919

2020
// == Build PCH
2121
// RUN: %deps-to-rsp %t/deps_pch.json --module-name A > %t/A.rsp
@@ -36,7 +36,7 @@
3636
// RUN: > %t/deps.json
3737

3838
// == Check specifics of the command-line
39-
// RUN: cat %t/deps.json | FileCheck %s -DPREFIX=%/t
39+
// RUN: cat %t/deps.json | %PathSanitizingFileCheck --sanitize PREFIX=%/t --enable-yaml-compatibility %s
4040

4141
// == Build TU, including PCH
4242
// RUN: %deps-to-rsp %t/deps.json --module-name C > %t/C.rsp
@@ -60,7 +60,7 @@
6060
// PCH: "command-line": [
6161
// PCH-NEXT: "-cc1"
6262
// PCH: "-fcas-path"
63-
// PCH-NEXT: "[[PREFIX]]{{.}}cas"
63+
// PCH-NEXT: "PREFIX{{/|\\\\}}cas"
6464
// PCH: "-fcas-fs"
6565
// PCH-NEXT: "[[A_ROOT_ID]]"
6666
// PCH: "-o"
@@ -73,8 +73,8 @@
7373
// PCH: "-fmodule-file={{(B=)?}}[[B_PCM]]"
7474
// PCH: ]
7575
// PCH: "file-deps": [
76-
// PCH-NEXT: "[[PREFIX]]{{.}}module.modulemap"
77-
// PCH-NEXT: "[[PREFIX]]{{.}}A.h"
76+
// PCH-NEXT: "PREFIX{{/|\\\\}}module.modulemap"
77+
// PCH-NEXT: "PREFIX{{/|\\\\}}A.h"
7878
// PCH-NEXT: ]
7979
// PCH: "name": "A"
8080
// PCH: }
@@ -84,7 +84,7 @@
8484
// PCH: "command-line": [
8585
// PCH-NEXT: "-cc1"
8686
// PCH: "-fcas-path"
87-
// PCH-NEXT: "[[PREFIX]]{{.}}cas"
87+
// PCH-NEXT: "PREFIX{{/|\\\\}}cas"
8888
// PCH: "-fcas-fs"
8989
// PCH-NEXT: "[[B_ROOT_ID]]"
9090
// PCH: "-o"
@@ -93,8 +93,8 @@
9393
// PCH: "-emit-module"
9494
// PCH: ]
9595
// PCH: "file-deps": [
96-
// PCH-NEXT: "[[PREFIX]]{{.}}module.modulemap"
97-
// PCH-NEXT: "[[PREFIX]]{{.}}B.h"
96+
// PCH-NEXT: "PREFIX{{/|\\\\}}module.modulemap"
97+
// PCH-NEXT: "PREFIX{{/|\\\\}}B.h"
9898
// PCH-NEXT: ]
9999
// PCH: "name": "B"
100100
// PCH: }
@@ -112,7 +112,7 @@
112112
// PCH: "command-line": [
113113
// PCH-NEXT: "-cc1"
114114
// PCH: "-fcas-path"
115-
// PCH-NEXT: "[[PREFIX]]{{.}}cas"
115+
// PCH-NEXT: "PREFIX{{/|\\\\}}cas"
116116
// PCH: "-fcas-fs"
117117
// PCH-NEXT: "[[PCH_ROOT_ID]]"
118118
// PCH: "-fno-pch-timestamp"
@@ -124,7 +124,7 @@
124124
// PCH: "-fmodule-file={{(A=)?}}[[A_PCM]]"
125125
// PCH: ]
126126
// PCH: "file-deps": [
127-
// PCH-NEXT: "[[PREFIX]]{{.}}prefix.h"
127+
// PCH-NEXT: "PREFIX{{/|\\\\}}prefix.h"
128128
// PCH-NEXT: ]
129129
// PCH: }
130130

@@ -136,7 +136,7 @@
136136
// CHECK: "command-line": [
137137
// CHECK-NEXT: "-cc1"
138138
// CHECK: "-fcas-path"
139-
// CHECK-NEXT: "[[PREFIX]]{{.}}cas"
139+
// CHECK-NEXT: "PREFIX{{/|\\\\}}cas"
140140
// CHECK: "-fcas-fs"
141141
// CHECK-NEXT: "[[C_ROOT_ID]]"
142142
// CHECK: "-o"
@@ -149,8 +149,8 @@
149149
// CHECK: "[[B_CACHE_KEY:llvmcas://[[:xdigit:]]+]]"
150150
// CHECK: ]
151151
// CHECK: "file-deps": [
152-
// CHECK-NEXT: "[[PREFIX]]{{.}}module.modulemap"
153-
// CHECK-NEXT: "[[PREFIX]]{{.}}C.h"
152+
// CHECK-NEXT: "PREFIX{{/|\\\\}}module.modulemap"
153+
// CHECK-NEXT: "PREFIX{{/|\\\\}}C.h"
154154
// CHECK-NEXT: ]
155155
// CHECK: "name": "C"
156156
// CHECK: }
@@ -168,7 +168,7 @@
168168
// CHECK: "command-line": [
169169
// CHECK-NEXT: "-cc1"
170170
// CHECK: "-fcas-path"
171-
// CHECK-NEXT: "[[PREFIX]]{{.}}cas"
171+
// CHECK-NEXT: "PREFIX{{/|\\\\}}cas"
172172
// CHECK: "-fcas-fs"
173173
// CHECK-NEXT: "[[TU_ROOT_ID]]"
174174
// CHECK: "-fno-pch-timestamp"
@@ -179,8 +179,8 @@
179179
// CHECK: "-fmodule-file={{(C=)?}}[[C_PCM]]"
180180
// CHECK: ]
181181
// CHECK: "file-deps": [
182-
// CHECK-NEXT: "[[PREFIX]]{{.}}tu.c"
183-
// CHECK-NEXT: "[[PREFIX]]{{.}}prefix.h.pch"
182+
// CHECK-NEXT: "PREFIX{{/|\\\\}}tu.c"
183+
// CHECK-NEXT: "PREFIX{{/|\\\\}}prefix.h.pch"
184184
// CHECK-NEXT: ]
185185
// CHECK: }
186186

‎clang/test/ClangScanDeps/modules-cas-trees.c‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
// CACHE-MISS: remark: compile job cache miss
6060

6161
// Check specifics of the command-line
62-
// RUN: cat %t/deps.json | FileCheck %s -DPREFIX=%/t
62+
// RUN: cat %t/deps.json | %PathSanitizingFileCheck --sanitize PREFIX=%/t --enable-yaml-compatibility %s
6363

6464
// CHECK: {
6565
// CHECK-NEXT: "modules": [
@@ -74,7 +74,7 @@
7474
// CHECK: "command-line": [
7575
// CHECK-NEXT: "-cc1"
7676
// CHECK: "-fcas-path"
77-
// CHECK-NEXT: "[[PREFIX]]{{.}}cas"
77+
// CHECK-NEXT: "PREFIX{{/|\\\\}}cas"
7878
// CHECK: "-fcas-fs"
7979
// CHECK-NEXT: "[[LEFT_ROOT_ID]]"
8080
// CHECK: "-o"
@@ -87,8 +87,8 @@
8787
// CHECK: "-fmodule-file={{(Top=)?}}[[TOP_PCM]]"
8888
// CHECK: ]
8989
// CHECK: "file-deps": [
90-
// CHECK-NEXT: "[[PREFIX]]{{.}}module.modulemap"
91-
// CHECK-NEXT: "[[PREFIX]]{{.}}Left.h"
90+
// CHECK-NEXT: "PREFIX{{/|\\\\}}module.modulemap"
91+
// CHECK-NEXT: "PREFIX{{/|\\\\}}Left.h"
9292
// CHECK-NEXT: ]
9393
// CHECK: "name": "Left"
9494
// CHECK: }
@@ -103,7 +103,7 @@
103103
// CHECK: "command-line": [
104104
// CHECK-NEXT: "-cc1"
105105
// CHECK: "-fcas-path"
106-
// CHECK-NEXT: "[[PREFIX]]{{.}}cas"
106+
// CHECK-NEXT: "PREFIX{{/|\\\\}}cas"
107107
// CHECK: "-fcas-fs"
108108
// CHECK-NEXT: "[[RIGHT_ROOT_ID]]"
109109
// CHECK: "-o"
@@ -116,8 +116,8 @@
116116
// CHECK: "-fmodule-file={{(Top=)?}}[[TOP_PCM]]"
117117
// CHECK: ]
118118
// CHECK: "file-deps": [
119-
// CHECK-NEXT: "[[PREFIX]]{{.}}module.modulemap"
120-
// CHECK-NEXT: "[[PREFIX]]{{.}}Right.h"
119+
// CHECK-NEXT: "PREFIX{{/|\\\\}}module.modulemap"
120+
// CHECK-NEXT: "PREFIX{{/|\\\\}}Right.h"
121121
// CHECK: ]
122122
// CHECK: "name": "Right"
123123
// CHECK: }
@@ -128,7 +128,7 @@
128128
// CHECK: "command-line": [
129129
// CHECK-NEXT: "-cc1"
130130
// CHECK: "-fcas-path"
131-
// CHECK-NEXT: "[[PREFIX]]{{.}}cas"
131+
// CHECK-NEXT: "PREFIX{{/|\\\\}}cas"
132132
// CHECK: "-fcas-fs"
133133
// CHECK-NEXT: "[[TOP_ROOT_ID]]"
134134
// CHECK: "-o"
@@ -137,8 +137,8 @@
137137
// CHECK: "-emit-module"
138138
// CHECK: ]
139139
// CHECK: "file-deps": [
140-
// CHECK-NEXT: "[[PREFIX]]{{.}}module.modulemap"
141-
// CHECK-NEXT: "[[PREFIX]]{{.}}Top.h"
140+
// CHECK-NEXT: "PREFIX{{/|\\\\}}module.modulemap"
141+
// CHECK-NEXT: "PREFIX{{/|\\\\}}Top.h"
142142
// CHECK: ]
143143
// CHECK: "name": "Top"
144144
// CHECK: }
@@ -160,7 +160,7 @@
160160
// CHECK: "command-line": [
161161
// CHECK-NEXT: "-cc1"
162162
// CHECK: "-fcas-path"
163-
// CHECK-NEXT: "[[PREFIX]]{{.}}cas"
163+
// CHECK-NEXT: "PREFIX{{/|\\\\}}cas"
164164
// CHECK: "-fcas-fs"
165165
// CHECK-NEXT: "[[TU_ROOT_ID]]"
166166
// CHECK: "-fcache-compile-job"
@@ -174,7 +174,7 @@
174174
// CHECK: "-fmodule-file={{(Right=)?}}[[RIGHT_PCM]]"
175175
// CHECK: ]
176176
// CHECK: "file-deps": [
177-
// CHECK-NEXT: "[[PREFIX]]{{.}}tu.c"
177+
// CHECK-NEXT: "PREFIX{{/|\\\\}}tu.c"
178178
// CHECK-NEXT: ]
179179
// CHECK: }
180180

‎llvm/include/llvm/CAS/FileSystemCache.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,6 @@ class FileSystemCache : public ThreadSafeRefCountedBase<FileSystemCache> {
224224

225225
DirectoryEntry &getRoot(StringRef root_path,
226226
std::optional<ObjectRef> RootRef = std::nullopt);
227-
StringRef getRootPathFor(StringRef Path) const;
228227
sys::path::Style getPathStyle() const { return PathStyle; }
229228

230229
using LookupSymlinkPathType =

0 commit comments

Comments
 (0)