From fa311ca600a4d2c21cc0952a94db777882ebcbc6 Mon Sep 17 00:00:00 2001 From: Jan Svoboda Date: Mon, 11 Nov 2024 12:58:51 -0800 Subject: [PATCH] [clang][deps] Adjust tests after upstream PR #114457 --- clang/test/ClangScanDeps/cas-fs-multiple-commands.c | 2 +- .../ClangScanDeps/include-tree-multiple-commands.c | 2 +- .../test/ClangScanDeps/modules-cas-fs-prefix-mapping.c | 6 +++--- .../test/ClangScanDeps/modules-cas-full-by-mod-name.c | 2 +- clang/test/ClangScanDeps/modules-cas-trees-with-pch.c | 6 +++--- clang/test/ClangScanDeps/modules-cas-trees.c | 6 +++--- .../ClangScanDeps/modules-include-tree-by-mod-name.c | 2 +- .../ClangScanDeps/modules-include-tree-prefix-map.c | 8 ++++---- .../test/ClangScanDeps/modules-include-tree-with-pch.c | 2 +- clang/test/ClangScanDeps/modules-include-tree.c | 10 +++++----- .../ClangScanDeps/modules-pch-cas-fs-prefix-mapping.c | 6 +++--- clang/test/Index/Core/scan-deps-by-mod-name.m | 2 +- clang/test/Index/Core/scan-deps-cas.m | 4 ++-- clang/test/Index/Core/scan-deps.m | 2 +- 14 files changed, 30 insertions(+), 30 deletions(-) diff --git a/clang/test/ClangScanDeps/cas-fs-multiple-commands.c b/clang/test/ClangScanDeps/cas-fs-multiple-commands.c index 447a258e727b2..1b32c4abcefad 100644 --- a/clang/test/ClangScanDeps/cas-fs-multiple-commands.c +++ b/clang/test/ClangScanDeps/cas-fs-multiple-commands.c @@ -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: diff --git a/clang/test/ClangScanDeps/include-tree-multiple-commands.c b/clang/test/ClangScanDeps/include-tree-multiple-commands.c index 59c2350d181e5..38e2397869b03 100644 --- a/clang/test/ClangScanDeps/include-tree-multiple-commands.c +++ b/clang/test/ClangScanDeps/include-tree-multiple-commands.c @@ -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: diff --git a/clang/test/ClangScanDeps/modules-cas-fs-prefix-mapping.c b/clang/test/ClangScanDeps/modules-cas-fs-prefix-mapping.c index 50f99f4fa609a..24190438079f4 100644 --- a/clang/test/ClangScanDeps/modules-cas-fs-prefix-mapping.c +++ b/clang/test/ClangScanDeps/modules-cas-fs-prefix-mapping.c @@ -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: } @@ -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" diff --git a/clang/test/ClangScanDeps/modules-cas-full-by-mod-name.c b/clang/test/ClangScanDeps/modules-cas-full-by-mod-name.c index edbc4e8c92fa6..957e383e2cb99 100644 --- a/clang/test/ClangScanDeps/modules-cas-full-by-mod-name.c +++ b/clang/test/ClangScanDeps/modules-cas-full-by-mod-name.c @@ -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" diff --git a/clang/test/ClangScanDeps/modules-cas-trees-with-pch.c b/clang/test/ClangScanDeps/modules-cas-trees-with-pch.c index ca34c32d2594c..d936e618ba770 100644 --- a/clang/test/ClangScanDeps/modules-cas-trees-with-pch.c +++ b/clang/test/ClangScanDeps/modules-cas-trees-with-pch.c @@ -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: } @@ -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: } @@ -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: } diff --git a/clang/test/ClangScanDeps/modules-cas-trees.c b/clang/test/ClangScanDeps/modules-cas-trees.c index 9aad19541aaef..f1cab97f9ed89 100644 --- a/clang/test/ClangScanDeps/modules-cas-trees.c +++ b/clang/test/ClangScanDeps/modules-cas-trees.c @@ -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: } @@ -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: } @@ -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: } diff --git a/clang/test/ClangScanDeps/modules-include-tree-by-mod-name.c b/clang/test/ClangScanDeps/modules-include-tree-by-mod-name.c index 0ef5b179412f8..cd5edf5120320 100644 --- a/clang/test/ClangScanDeps/modules-include-tree-by-mod-name.c +++ b/clang/test/ClangScanDeps/modules-include-tree-by-mod-name.c @@ -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" diff --git a/clang/test/ClangScanDeps/modules-include-tree-prefix-map.c b/clang/test/ClangScanDeps/modules-include-tree-prefix-map.c index 5eb2f98b8f826..8eb7da7be4bea 100644 --- a/clang/test/ClangScanDeps/modules-include-tree-prefix-map.c +++ b/clang/test/ClangScanDeps/modules-include-tree-prefix-map.c @@ -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: } @@ -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: } @@ -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: } @@ -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: } diff --git a/clang/test/ClangScanDeps/modules-include-tree-with-pch.c b/clang/test/ClangScanDeps/modules-include-tree-with-pch.c index 60b2ba3daf851..d8efe277c35ab 100644 --- a/clang/test/ClangScanDeps/modules-include-tree-with-pch.c +++ b/clang/test/ClangScanDeps/modules-include-tree-with-pch.c @@ -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: } diff --git a/clang/test/ClangScanDeps/modules-include-tree.c b/clang/test/ClangScanDeps/modules-include-tree.c index cb42ded1fc728..de61673523e53 100644 --- a/clang/test/ClangScanDeps/modules-include-tree.c +++ b/clang/test/ClangScanDeps/modules-include-tree.c @@ -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: } @@ -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: } @@ -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: } @@ -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: } @@ -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: } diff --git a/clang/test/ClangScanDeps/modules-pch-cas-fs-prefix-mapping.c b/clang/test/ClangScanDeps/modules-pch-cas-fs-prefix-mapping.c index 4b0a436e8e217..aee657ce58e3d 100644 --- a/clang/test/ClangScanDeps/modules-pch-cas-fs-prefix-mapping.c +++ b/clang/test/ClangScanDeps/modules-pch-cas-fs-prefix-mapping.c @@ -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: } @@ -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: } diff --git a/clang/test/Index/Core/scan-deps-by-mod-name.m b/clang/test/Index/Core/scan-deps-by-mod-name.m index af3c84c5cb316..114b059355dff 100644 --- a/clang/test/Index/Core/scan-deps-by-mod-name.m +++ b/clang/test/Index/Core/scan-deps-by-mod-name.m @@ -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: diff --git a/clang/test/Index/Core/scan-deps-cas.m b/clang/test/Index/Core/scan-deps-cas.m index 1bef44c95ca8e..4456f108cf720 100644 --- a/clang/test/Index/Core/scan-deps-cas.m +++ b/clang/test/Index/Core/scan-deps-cas.m @@ -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 @@ -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 diff --git a/clang/test/Index/Core/scan-deps.m b/clang/test/Index/Core/scan-deps.m index 44adc11c4ec24..04aada3ba9507 100644 --- a/clang/test/Index/Core/scan-deps.m +++ b/clang/test/Index/Core/scan-deps.m @@ -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: