Skip to content

Commit 12ae09b

Browse files
committed
[clang][cas][test] Fix some tests that depended on build directory name
We sort module file-deps by name, but tests that have deps spanning different directory "roots" such as build and source directories need to ignore the ordering. (cherry picked from commit acab388)
1 parent 3a71d18 commit 12ae09b

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

clang/test/ClangScanDeps/modules-cas-fs-prefix-mapping.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,11 @@
116116
// CHECK: ]
117117
// CHECK: "context-hash": "[[B_CONTEXT_HASH]]"
118118
// CHECK: "file-deps": [
119-
// CHECK: "{{.*}}/include/stdarg.h"
120-
// CHECK: "[[PREFIX]]/b.h"
121-
// CHECK: "[[PREFIX]]/module.modulemap"
122-
// CHECK: "[[SDK_PREFIX]]/usr/include/stdlib.h"
119+
// Note: PREFIX, SDK_PREFIX and toolchain path are unordered
120+
// CHECK-DAG: "{{.*}}/include/stdarg.h"
121+
// CHECK-DAG: "[[PREFIX]]/b.h"
122+
// CHECK-DAG: "[[PREFIX]]/module.modulemap"
123+
// CHECK-DAG: "[[SDK_PREFIX]]/usr/include/stdlib.h"
123124
// CHECK: ]
124125
// CHECK: "name": "B"
125126
// CHECK: }

clang/test/ClangScanDeps/modules-pch-cas-fs-prefix-mapping.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,11 @@
146146
// PCH: ]
147147
// PCH: "context-hash": "[[B_CONTEXT_HASH]]"
148148
// PCH: "file-deps": [
149-
// PCH: "{{.*}}/include/stdarg.h"
150-
// PCH: "[[PREFIX]]/b.h"
151-
// PCH: "[[PREFIX]]/module.modulemap"
152-
// PCH: "[[SDK_PREFIX]]/usr/include/stdlib.h"
149+
// Note: PREFIX, SDK_PREFIX and toolchain path are unordered
150+
// PCH-DAG: "{{.*}}/include/stdarg.h"
151+
// PCH-DAG: "[[PREFIX]]/b.h"
152+
// PCH-DAG: "[[PREFIX]]/module.modulemap"
153+
// PCH-DAG: "[[SDK_PREFIX]]/usr/include/stdlib.h"
153154
// PCH: ]
154155
// PCH: "name": "B"
155156
// PCH: }

0 commit comments

Comments
 (0)