Skip to content

Commit 6bb836a

Browse files
committed
Revert "[clang][deps] NFC: De-duplicate clang-cl tests"
This reverts commit 30cb49b. It caused test failures on Fuchsia Toolchain Mac builds: https://luci-milo.appspot.com/ui/p/fuchsia/builders/toolchain.ci/clang-mac-x64/b8818888168677577537/overview
1 parent 33b214b commit 6bb836a

29 files changed

+239
-147
lines changed

clang/test/ClangScanDeps/Inputs/has_include_if_elif.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,10 @@
33
"directory": "DIR",
44
"command": "clang -E DIR/has_include_if_elif2.cpp -IInputs",
55
"file": "DIR/has_include_if_elif2.cpp"
6+
},
7+
{
8+
"directory": "DIR",
9+
"command": "clang-cl /E /IInputs -- DIR/has_include_if_elif2_clangcl.cpp",
10+
"file": "DIR/has_include_if_elif2_clangcl.cpp"
611
}
712
]

clang/test/ClangScanDeps/Inputs/header_stat_before_open_cdb.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,10 @@
33
"directory": "DIR",
44
"command": "clang -E DIR/header_stat_before_open_input.m -iframework Inputs/frameworks",
55
"file": "DIR/header_stat_before_open_input.m"
6+
},
7+
{
8+
"directory": "DIR",
9+
"command": "clang-cl /E -Xclang -iframework -Xclang Inputs/frameworks -- DIR/header_stat_before_open_input_clangcl.m",
10+
"file": "DIR/header_stat_before_open_input_clangcl.m"
611
}
712
]

clang/test/ClangScanDeps/Inputs/headerwithdirname.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,10 @@
33
"directory": "DIR",
44
"command": "clang -c -IDIR -IDIR/foodir -IInputs DIR/headerwithdirname_input.cpp",
55
"file": "DIR/headerwithdirname_input.cpp"
6+
},
7+
{
8+
"directory": "DIR",
9+
"command": "clang-cl /c /IDIR /IDIR/foodir -IInputs -- DIR/headerwithdirname_input_clangcl.cpp",
10+
"file": "DIR/headerwithdirname_input_clangcl.cpp"
611
}
712
]

clang/test/ClangScanDeps/Inputs/headerwithdirnamefollowedbyinclude.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,10 @@
33
"directory": "DIR",
44
"command": "clang -c -IDIR -IInputs DIR/headerwithdirname_input.cpp",
55
"file": "DIR/headerwithdirname_input.cpp"
6+
},
7+
{
8+
"directory": "DIR",
9+
"command": "clang-cl /c /IDIR /IInputs -- DIR/headerwithdirname_input_clangcl.cpp",
10+
"file": "DIR/headerwithdirname_input_clangcl.cpp"
611
}
712
]
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
[
2+
{
3+
"directory": "DIR",
4+
"command": "clang-cl /E /IInputs /D INCLUDE_HEADER2 /clang:-MD /clang:-MF /clang:DIR/modules_cdb2_clangcl.d /clang:-fmodules /clang:-fcxx-modules /clang:-fmodules-cache-path=DIR/module-cache_clangcl /clang:-fimplicit-modules /clang:-fimplicit-module-maps -- DIR/modules_cdb_input2.cpp",
5+
"file": "DIR/modules_cdb_input2.cpp"
6+
},
7+
{
8+
"directory": "DIR",
9+
"command": "clang-cl /E /IInputs /clang:-fmodules /clang:-fcxx-modules /clang:-fmodules-cache-path=DIR/module-cache_clangcl /clang:-fimplicit-modules /clang:-fimplicit-module-maps -- DIR/modules_cdb_input.cpp",
10+
"file": "DIR/modules_cdb_input.cpp"
11+
},
12+
{
13+
"directory": "DIR",
14+
"command": "clang-cl /E /IInputs /clang:-fmodules /clang:-fcxx-modules /clang:-fmodules-cache-path=DIR/module-cache_clangcl /clang:-fimplicit-modules /clang:-fimplicit-module-maps -o a.o -- DIR/modules_cdb_input.cpp",
15+
"file": "DIR/modules_cdb_input.cpp"
16+
},
17+
{
18+
"directory": "DIR",
19+
"command": "clang-cl /E /IInputs /clang:-fmodules /clang:-fcxx-modules /clang:-fmodules-cache-path=DIR/module-cache_clangcl /clang:-fimplicit-modules /clang:-fimplicit-module-maps -o b.o -- DIR/modules_cdb_input.cpp",
20+
"file": "DIR/modules_cdb_input.cpp"
21+
}
22+
]
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
[
2+
{
3+
"directory": "DIR",
4+
"command": "clang-cl /E /IInputs /D INCLUDE_HEADER2 /clang:-MD /clang:-MF /clang:DIR/modules_cdb2_clangcl.d /clang:-fmodules /clang:-fcxx-modules /clang:-fmodules-cache-path=DIR/module-cache_clangcl /clang:-fimplicit-modules /clang:-fimplicit-module-maps /clang:-x /clang:c++ --",
5+
"file": ""
6+
},
7+
{
8+
"directory": "DIR",
9+
"command": "clang-cl /E /IInputs /clang:-fmodules /clang:-fcxx-modules /clang:-fmodules-cache-path=DIR/module-cache_clangcl /clang:-fimplicit-modules /clang:-fimplicit-module-maps /clang:-x /clang:c++ --",
10+
"file": ""
11+
},
12+
]

clang/test/ClangScanDeps/Inputs/no-werror.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,10 @@
33
"directory": "DIR",
44
"command": "clang -E DIR/no-werror_input.cpp -IInputs -std=c++17 -Weverything -Werror",
55
"file": "DIR/no-werror.cpp"
6+
},
7+
{
8+
"directory": "DIR",
9+
"command": "clang-cl /E /IInputs /std:c++17 -Weverything -Werror -- DIR/no-werror_input_clangcl.cpp",
10+
"file": "DIR/no-werror_clangcl.cpp"
611
}
712
]
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
[
2+
{
3+
"directory": "DIR",
4+
"command": "clang --driver-mode=cl /E /IInputs /D INCLUDE_HEADER2 /clang:-MD /clang:-MF /clang:DIR/regular_cdb2_clangcl.d -- DIR/regular_cdb_input2.cpp",
5+
"file": "DIR/regular_cdb_input2.cpp"
6+
},
7+
{
8+
"directory": "DIR",
9+
"command": "clang-cl /E /IInputs -- DIR/regular_cdb_input.cpp",
10+
"file": "DIR/regular_cdb_input.cpp"
11+
},
12+
{
13+
"directory": "DIR",
14+
"command": "clang-cl /E /IInputs /Foadena.o -- DIR/regular_cdb_input.cpp",
15+
"file": "DIR/regular_cdb_input.cpp"
16+
}
17+
]

clang/test/ClangScanDeps/Inputs/static-analyzer-cdb.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,10 @@
33
"directory": "DIR",
44
"command": "clang --analyze DIR/static-analyzer_clang.c",
55
"file": "DIR/static-analyzer_clang.c"
6+
},
7+
{
8+
"directory": "DIR",
9+
"command": "clang-cl --analyze -- DIR/static-analyzer_clangcl.c",
10+
"file": "DIR/static-analyzer_clangcl.c"
611
}
712
]

clang/test/ClangScanDeps/Inputs/target-filename-cdb.json

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,45 @@
2323
"directory": "DIR",
2424
"command": "clang-cl /E -- DIR/target-filename_input.cpp",
2525
"file": "DIR/target-filename_input.cpp"
26+
},
27+
{
28+
"directory": "DIR",
29+
"command": "clang-cl /E -o clangcl-a.o -- DIR/target-filename_input.cpp",
30+
"file": "DIR/target-filename_input.cpp"
31+
},
32+
{
33+
"directory": "DIR",
34+
"command": "clang-cl /E -oclangcl-b.o -- DIR/target-filename_input.cpp",
35+
"file": "DIR/target-filename_input.cpp"
36+
},
37+
{
38+
"directory": "DIR",
39+
"command": "clang-cl /E /o clangcl-c.o -- DIR/target-filename_input.cpp",
40+
"file": "DIR/target-filename_input.cpp"
41+
},
42+
{
43+
"directory": "DIR",
44+
"command": "clang-cl /E /oclangcl-d.o -- DIR/target-filename_input.cpp",
45+
"file": "DIR/target-filename_input.cpp"
46+
},
47+
{
48+
"directory": "DIR",
49+
"command": "clang-cl /E /Foclangcl-e.o -- DIR/target-filename_input.cpp",
50+
"file": "DIR/target-filename_input.cpp"
51+
},
52+
{
53+
"directory": "DIR",
54+
"command": "clang-cl /E -o clangcl-firstf.o -o clangcl-lastf.o -- DIR/target-filename_input.cpp",
55+
"file": "DIR/target-filename_input.cpp"
56+
},
57+
{
58+
"directory": "DIR",
59+
"command": "clang-cl /E /oclangcl-firstg.o /Foclangcl-lastg.o -- DIR/target-filename_input.cpp",
60+
"file": "DIR/target-filename_input.cpp"
61+
},
62+
{
63+
"directory": "DIR",
64+
"command": "clang-cl /E /Foclangcl-firsth.o -o clangcl-midh.o /oclangcl-lasth.o -- DIR/target-filename_input.cpp",
65+
"file": "DIR/target-filename_input.cpp"
2666
}
2767
]

0 commit comments

Comments
 (0)