Skip to content

[clang][deps] Adjust tests after upstream PR #114457 #9572

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 11, 2024
Merged

[clang][deps] Adjust tests after upstream PR #114457 #9572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion clang/test/ClangScanDeps/cas-fs-multiple-commands.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,8 @@
// CHECK-LIBCLANG-NEXT: cache-key: [[M_CACHE_KEY:llvmcas://[[:xdigit:]]+]]
// CHECK-LIBCLANG-NEXT: module-deps:
// CHECK-LIBCLANG-NEXT: file-deps:
// CHECK-LIBCLANG-NEXT: [[PREFIX]]/module.h
// CHECK-LIBCLANG-NEXT: [[PREFIX]]/module.modulemap
// CHECK-LIBCLANG-NEXT: [[PREFIX]]/module.h
// CHECK-LIBCLANG-NEXT: build-args: -cc1 {{.*}} -fcas-fs [[M_ROOT_ID]]
// CHECK-LIBCLANG-NEXT: dependencies:
// CHECK-LIBCLANG-NEXT: command 0:
Expand Down
2 changes: 1 addition & 1 deletion clang/test/ClangScanDeps/include-tree-multiple-commands.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,8 @@
// CHECK-LIBCLANG-NEXT: cache-key: [[M_CACHE_KEY:llvmcas://[[:xdigit:]]+]]
// CHECK-LIBCLANG-NEXT: module-deps:
// CHECK-LIBCLANG-NEXT: file-deps:
// CHECK-LIBCLANG-NEXT: [[PREFIX]]/include/module.h
// CHECK-LIBCLANG-NEXT: [[PREFIX]]/include/module.modulemap
// CHECK-LIBCLANG-NEXT: [[PREFIX]]/include/module.h
// CHECK-LIBCLANG-NEXT: build-args: -cc1 {{.*}} -fcas-include-tree [[M_INCLUDE_TREE]]
// CHECK-LIBCLANG-NEXT: dependencies:
// CHECK-LIBCLANG-NEXT: command 0:
Expand Down
6 changes: 3 additions & 3 deletions clang/test/ClangScanDeps/modules-cas-fs-prefix-mapping.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@
// CHECK: "/^sdk/usr/include"
// CHECK: ]
// CHECK: "file-deps": [
// CHECK: "[[PREFIX]]/a.h"
// CHECK: "[[PREFIX]]/module.modulemap"
// CHECK: "[[PREFIX]]/a.h"
// CHECK: ]
// CHECK: "name": "A"
// CHECK: }
Expand Down Expand Up @@ -115,9 +115,9 @@
// CHECK: "context-hash": "[[B_CONTEXT_HASH]]"
// CHECK: "file-deps": [
// Note: PREFIX, SDK_PREFIX and toolchain path are unordered
// CHECK-DAG: "{{.*}}/include/stdarg.h"
// CHECK-DAG: "[[PREFIX]]/b.h"
// CHECK-DAG: "[[PREFIX]]/module.modulemap"
// CHECK-DAG: "[[PREFIX]]/b.h"
// CHECK-DAG: "{{.*}}/include/stdarg.h"
// CHECK-DAG: "[[SDK_PREFIX]]/usr/include/stdlib.h"
// CHECK: ]
// CHECK: "name": "B"
Expand Down
2 changes: 1 addition & 1 deletion clang/test/ClangScanDeps/modules-cas-full-by-mod-name.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ module transitive { header "transitive.h" }
// CHECK: ],
// CHECK-NEXT: "context-hash": "{{.*}}",
// CHECK-NEXT: "file-deps": [
// CHECK-NEXT: "[[PREFIX]]/direct.h"
// CHECK-NEXT: "[[PREFIX]]/module.modulemap"
// CHECK-NEXT: "[[PREFIX]]/direct.h"
// CHECK-NEXT: ],
// CHECK-NEXT: "link-libraries": [],
// CHECK-NEXT: "name": "direct"
Expand Down
6 changes: 3 additions & 3 deletions clang/test/ClangScanDeps/modules-cas-trees-with-pch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@
// PCH: "-fmodule-file={{(B=)?}}[[B_PCM]]"
// PCH: ]
// PCH: "file-deps": [
// PCH-NEXT: "[[PREFIX]]{{.}}A.h"
// PCH-NEXT: "[[PREFIX]]{{.}}module.modulemap"
// PCH-NEXT: "[[PREFIX]]{{.}}A.h"
// PCH-NEXT: ]
// PCH: "name": "A"
// PCH: }
Expand All @@ -93,8 +93,8 @@
// PCH: "-emit-module"
// PCH: ]
// PCH: "file-deps": [
// PCH-NEXT: "[[PREFIX]]{{.}}B.h"
// PCH-NEXT: "[[PREFIX]]{{.}}module.modulemap"
// PCH-NEXT: "[[PREFIX]]{{.}}B.h"
// PCH-NEXT: ]
// PCH: "name": "B"
// PCH: }
Expand Down Expand Up @@ -149,8 +149,8 @@
// CHECK: "[[B_CACHE_KEY:llvmcas://[[:xdigit:]]+]]"
// CHECK: ]
// CHECK: "file-deps": [
// CHECK-NEXT: "[[PREFIX]]{{.}}C.h"
// CHECK-NEXT: "[[PREFIX]]{{.}}module.modulemap"
// CHECK-NEXT: "[[PREFIX]]{{.}}C.h"
// CHECK-NEXT: ]
// CHECK: "name": "C"
// CHECK: }
Expand Down
6 changes: 3 additions & 3 deletions clang/test/ClangScanDeps/modules-cas-trees.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@
// CHECK: "-fmodule-file={{(Top=)?}}[[TOP_PCM]]"
// CHECK: ]
// CHECK: "file-deps": [
// CHECK-NEXT: "[[PREFIX]]{{.}}Left.h"
// CHECK-NEXT: "[[PREFIX]]{{.}}module.modulemap"
// CHECK-NEXT: "[[PREFIX]]{{.}}Left.h"
// CHECK-NEXT: ]
// CHECK: "name": "Left"
// CHECK: }
Expand Down Expand Up @@ -116,8 +116,8 @@
// CHECK: "-fmodule-file={{(Top=)?}}[[TOP_PCM]]"
// CHECK: ]
// CHECK: "file-deps": [
// CHECK-NEXT: "[[PREFIX]]{{.}}Right.h"
// CHECK-NEXT: "[[PREFIX]]{{.}}module.modulemap"
// CHECK-NEXT: "[[PREFIX]]{{.}}Right.h"
// CHECK: ]
// CHECK: "name": "Right"
// CHECK: }
Expand All @@ -137,8 +137,8 @@
// CHECK: "-emit-module"
// CHECK: ]
// CHECK: "file-deps": [
// CHECK-NEXT: "[[PREFIX]]{{.}}Top.h"
// CHECK-NEXT: "[[PREFIX]]{{.}}module.modulemap"
// CHECK-NEXT: "[[PREFIX]]{{.}}Top.h"
// CHECK: ]
// CHECK: "name": "Top"
// CHECK: }
Expand Down
2 changes: 1 addition & 1 deletion clang/test/ClangScanDeps/modules-include-tree-by-mod-name.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ module transitive { header "transitive.h" }
// CHECK: ],
// CHECK-NEXT: "context-hash": "{{.*}}",
// CHECK-NEXT: "file-deps": [
// CHECK-NEXT: "[[PREFIX]]/direct.h"
// CHECK-NEXT: "[[PREFIX]]/module.modulemap"
// CHECK-NEXT: "[[PREFIX]]/direct.h"
// CHECK-NEXT: ],
// CHECK-NEXT: "link-libraries": [],
// CHECK-NEXT: "name": "direct"
Expand Down
8 changes: 4 additions & 4 deletions clang/test/ClangScanDeps/modules-include-tree-prefix-map.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,8 @@
// CHECK: "-fno-implicit-modules"
// CHECK: ]
// CHECK: "file-deps": [
// CHECK-NEXT: "[[PREFIX]]/dir1/Left.h"
// CHECK-NEXT: "[[PREFIX]]/dir1/module.modulemap"
// CHECK-NEXT: "[[PREFIX]]/dir1/Left.h"
// CHECK: ]
// CHECK: "name": "Left"
// CHECK: }
Expand Down Expand Up @@ -175,8 +175,8 @@
// CHECK: "-fno-implicit-modules"
// CHECK: ]
// CHECK: "file-deps": [
// CHECK-NEXT: "[[PREFIX]]/dir1/Right.h"
// CHECK-NEXT: "[[PREFIX]]/dir1/module.modulemap"
// CHECK-NEXT: "[[PREFIX]]/dir1/Right.h"
// CHECK-NEXT: ]
// CHECK: "name": "Right"
// CHECK: }
Expand All @@ -201,9 +201,9 @@
// CHECK: "-fno-implicit-modules"
// CHECK: ]
// CHECK: "file-deps": [
// CHECK-DAG: "{{.*}}/stdbool.h"
// CHECK-DAG: "[[PREFIX]]/dir1/System/module.modulemap"
// CHECK-DAG: "[[PREFIX]]/dir1/System/sys.h"
// CHECK-DAG: "{{.*}}/stdbool.h"
// CHECK: ]
// CHECK: "name": "System"
// CHECK: }
Expand All @@ -228,8 +228,8 @@
// CHECK: "-fno-implicit-modules"
// CHECK: ]
// CHECK: "file-deps": [
// CHECK-NEXT: "[[PREFIX]]/dir1/Top.h"
// CHECK-NEXT: "[[PREFIX]]/dir1/module.modulemap"
// CHECK-NEXT: "[[PREFIX]]/dir1/Top.h"
// CHECK-NEXT: ]
// CHECK: "name": "Top"
// CHECK: }
Expand Down
2 changes: 1 addition & 1 deletion clang/test/ClangScanDeps/modules-include-tree-with-pch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
// CHECK: "-fno-implicit-modules"
// CHECK: ]
// CHECK: "file-deps": [
// CHECK-NEXT: "[[PREFIX]]/Right.h"
// CHECK-NEXT: "[[PREFIX]]/module.modulemap"
// CHECK-NEXT: "[[PREFIX]]/Right.h"
// CHECK-NEXT: ]
// CHECK: "name": "Right"
// CHECK: }
Expand Down
10 changes: 5 additions & 5 deletions clang/test/ClangScanDeps/modules-include-tree.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,8 @@
// CHECK: "-fno-implicit-modules"
// CHECK: ]
// CHECK: "file-deps": [
// CHECK-NEXT: "[[PREFIX]]/Left.h"
// CHECK-NEXT: "[[PREFIX]]/module.modulemap"
// CHECK-NEXT: "[[PREFIX]]/Left.h"
// CHECK: ]
// CHECK: "name": "Left"
// CHECK: }
Expand Down Expand Up @@ -159,8 +159,8 @@
// CHECK: "-fno-implicit-modules"
// CHECK: ]
// CHECK: "file-deps": [
// CHECK-NEXT: "[[PREFIX]]/Right.h"
// CHECK-NEXT: "[[PREFIX]]/module.modulemap"
// CHECK-NEXT: "[[PREFIX]]/Right.h"
// CHECK-NEXT: ]
// CHECK: "name": "Right"
// CHECK: }
Expand All @@ -185,8 +185,8 @@
// CHECK: "-fno-implicit-modules"
// CHECK: ]
// CHECK: "file-deps": [
// CHECK-NEXT: "[[PREFIX]]/Top.h"
// CHECK-NEXT: "[[PREFIX]]/module.modulemap"
// CHECK-NEXT: "[[PREFIX]]/Top.h"
// CHECK-NEXT: ]
// CHECK: "name": "Top"
// CHECK: }
Expand All @@ -211,8 +211,8 @@
// CHECK: "-fno-implicit-modules"
// CHECK: ]
// CHECK: "file-deps": [
// CHECK-NEXT: "[[PREFIX]]/AtImport.h"
// CHECK-NEXT: "[[PREFIX]]/module.modulemap"
// CHECK-NEXT: "[[PREFIX]]/AtImport.h"
// CHECK-NEXT: ]
// CHECK: "name": "ZAtImport"
// CHECK: }
Expand All @@ -237,8 +237,8 @@
// CHECK: "-fno-implicit-modules"
// CHECK: ]
// CHECK: "file-deps": [
// CHECK-NEXT: "[[PREFIX]]/PragmaImport.h"
// CHECK-NEXT: "[[PREFIX]]/module.modulemap"
// CHECK-NEXT: "[[PREFIX]]/PragmaImport.h"
// CHECK-NEXT: ]
// CHECK: "name": "ZPragmaImport"
// CHECK: }
Expand Down
6 changes: 3 additions & 3 deletions clang/test/ClangScanDeps/modules-pch-cas-fs-prefix-mapping.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@
// PCH: "/^sdk/usr/include"
// PCH: ]
// PCH: "file-deps": [
// PCH: "[[PREFIX]]/a.h"
// PCH: "[[PREFIX]]/module.modulemap"
// PCH: "[[PREFIX]]/a.h"
// PCH: ]
// PCH: "name": "A"
// PCH: }
Expand Down Expand Up @@ -145,10 +145,10 @@
// PCH: "context-hash": "[[B_CONTEXT_HASH]]"
// PCH: "file-deps": [
// Note: PREFIX, SDK_PREFIX and toolchain path are unordered
// PCH-DAG: "{{.*}}/include/stdarg.h"
// PCH-DAG: "[[PREFIX]]/b.h"
// PCH-DAG: "[[PREFIX]]/module.modulemap"
// PCH-DAG: "[[PREFIX]]/b.h"
// PCH-DAG: "[[SDK_PREFIX]]/usr/include/stdlib.h"
// PCH-DAG: "{{.*}}/include/stdarg.h"
// PCH: ]
// PCH: "name": "B"
// PCH: }
Expand Down
2 changes: 1 addition & 1 deletion clang/test/Index/Core/scan-deps-by-mod-name.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
// CHECK-NEXT: module-map-path: [[PREFIX]]/Inputs/module/module.modulemap
// CHECK-NEXT: module-deps:
// CHECK-NEXT: file-deps:
// CHECK-NEXT: [[PREFIX]]/Inputs/module/module.modulemap
// CHECK-NEXT: [[PREFIX]]/Inputs/module/ModA.h
// CHECK-NEXT: [[PREFIX]]/Inputs/module/SubModA.h
// CHECK-NEXT: [[PREFIX]]/Inputs/module/SubSubModA.h
// CHECK-NEXT: [[PREFIX]]/Inputs/module/module.modulemap
// CHECK-NEXT: build-args: {{.*}} -emit-module {{.*}} -fmodule-name=ModA {{.*}} -fno-implicit-modules {{.*}}
// CHECK-NEXT: dependencies:
// CHECK-NEXT: command 0:
Expand Down
4 changes: 2 additions & 2 deletions clang/test/Index/Core/scan-deps-cas.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@
// CHECK-NEXT: cache-key: [[CASFS_MODA_CACHE_KEY:llvmcas://[[:xdigit:]]+]]
// CHECK-NEXT: module-deps:
// CHECK-NEXT: file-deps:
// CHECK-NEXT: [[PREFIX]]/Inputs/module/module.modulemap
// CHECK-NEXT: [[PREFIX]]/Inputs/module/ModA.h
// CHECK-NEXT: [[PREFIX]]/Inputs/module/SubModA.h
// CHECK-NEXT: [[PREFIX]]/Inputs/module/SubSubModA.h
// CHECK-NEXT: [[PREFIX]]/Inputs/module/module.modulemap
// CHECK-NEXT: build-args:
// CHECK-SAME: -cc1
// CHECK-SAME: -fcas-path
Expand Down Expand Up @@ -77,10 +77,10 @@
// INCLUDE_TREE-NEXT: cache-key: [[ModA_CACHE_KEY:llvmcas://[[:xdigit:]]+]]
// INCLUDE_TREE-NEXT: module-deps:
// INCLUDE_TREE-NEXT: file-deps:
// INCLUDE_TREE-NEXT: [[PREFIX]]/Inputs/module/module.modulemap
// INCLUDE_TREE-NEXT: [[PREFIX]]/Inputs/module/ModA.h
// INCLUDE_TREE-NEXT: [[PREFIX]]/Inputs/module/SubModA.h
// INCLUDE_TREE-NEXT: [[PREFIX]]/Inputs/module/SubSubModA.h
// INCLUDE_TREE-NEXT: [[PREFIX]]/Inputs/module/module.modulemap
// INCLUDE_TREE-NEXT: build-args:
// INCLUDE_TREE-SAME: -cc1
// INCLUDE_TREE-SAME: -fcas-path
Expand Down
2 changes: 1 addition & 1 deletion clang/test/Index/Core/scan-deps.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
// CHECK-NEXT: module-map-path: [[PREFIX]]/Inputs/module/module.modulemap
// CHECK-NEXT: module-deps:
// CHECK-NEXT: file-deps:
// CHECK-NEXT: [[PREFIX]]/Inputs/module/module.modulemap
// CHECK-NEXT: [[PREFIX]]/Inputs/module/ModA.h
// CHECK-NEXT: [[PREFIX]]/Inputs/module/SubModA.h
// CHECK-NEXT: [[PREFIX]]/Inputs/module/SubSubModA.h
// CHECK-NEXT: [[PREFIX]]/Inputs/module/module.modulemap
// CHECK-NEXT: build-args: {{.*}} -emit-module {{.*}} -fmodule-name=ModA {{.*}} -fno-implicit-modules {{.*}}

// CHECK-NEXT: dependencies:
Expand Down