Skip to content

Commit 4b9ce22

Browse files
[clang][tests] Fix CAS tests after upstream llvm#108539
Fix clang path output in clang-scan-deps output after upstream change makes the tool to return full path to clang.
1 parent ed6a5e2 commit 4b9ce22

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

clang/test/ClangScanDeps/cas-trees.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,13 @@
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 -check-prefix=COMPDB
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
8787
// COMPDB: [
8888
// COMPDB: {
8989
// COMPDB: "file": "[[PREFIX]]/t1.c",
9090
// COMPDB: "directory": "[[PREFIX]]",
9191
// COMPDB: "arguments": [
92-
// COMPDB: "clang",
92+
// COMPDB: "[[CLANG]]",
9393
// COMPDB: "-cc1",
9494
// COMPDB: "-fcas-path",
9595
// COMPDB: "[[PREFIX]]/cas",

clang/test/ClangScanDeps/include-tree-with-pch.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
// RUN: echo "FULL DEPS START" >> %t/full.txt
2828
// RUN: cat %t/deps.json | sed 's:\\\\\?:/:g' >> %t/full.txt
2929

30-
// RUN: FileCheck %s -DPREFIX=%/t -check-prefix=FULL -input-file %t/full.txt
30+
// RUN: FileCheck %s -DPREFIX=%/t -DCLANG=%clang -check-prefix=FULL -input-file %t/full.txt
3131

3232
// Capture the tree id from experimental-include-tree ; ensure that it matches
3333
// the result from experimental-full.
@@ -57,7 +57,7 @@
5757
// FULL-NEXT: "t.c"
5858
// FULL-NOT: "t.c"
5959
// FULL: ]
60-
// FULL: "executable": "clang"
60+
// FULL: "executable": "[[CLANG]]"
6161
// FULL: "file-deps": [
6262
// FULL-NEXT: "[[PREFIX]]/t.c"
6363
// FULL-NEXT: "[[PREFIX]]/t.h"

clang/test/ClangScanDeps/include-tree.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
// RUN: echo "FULL DEPS START" >> %t/full.txt
3737
// RUN: cat %t/deps.json | sed 's:\\\\\?:/:g' >> %t/full.txt
3838

39-
// RUN: FileCheck %s -DPREFIX=%/t -check-prefix=FULL -input-file %t/full.txt
39+
// RUN: FileCheck %s -DPREFIX=%/t -DCLANG=%clang -check-prefix=FULL -input-file %t/full.txt
4040

4141
// Capture the tree id from experimental-include-tree ; ensure that it matches
4242
// the result from experimental-full.
@@ -67,7 +67,7 @@
6767
// FULL-NEXT: "t.c"
6868
// FULL-NOT: "t.c"
6969
// FULL: ]
70-
// FULL: "executable": "clang"
70+
// FULL: "executable": "[[CLANG]]"
7171
// FULL: "file-deps": [
7272
// FULL-NEXT: "[[PREFIX]]/t.c"
7373
// FULL-NEXT: "[[PREFIX]]/top.h"

0 commit comments

Comments
 (0)