diff options
| -rw-r--r-- | clang/test/Modules/implicit-invalidate-chain.c | 46 | ||||
| -rw-r--r-- | clang/test/Modules/relative-import-path.c | 12 |
2 files changed, 29 insertions, 29 deletions
diff --git a/clang/test/Modules/implicit-invalidate-chain.c b/clang/test/Modules/implicit-invalidate-chain.c index 458f24a4dd8..f7727a6579d 100644 --- a/clang/test/Modules/implicit-invalidate-chain.c +++ b/clang/test/Modules/implicit-invalidate-chain.c @@ -33,35 +33,35 @@ // RUN: FileCheck %s -implicit-check-not "remark:" #include "A.h" // \ - expected-remark-re{{importing module 'A' from '{{.*}}/A.pcm'}} \ - expected-remark-re{{importing module 'B' into 'A' from '{{.*}}/B.pcm'}} \ - expected-remark-re{{importing module 'C' into 'B' from '{{.*}}/C.pcm'}} \ - expected-remark-re{{importing module 'D' into 'C' from '{{.*}}/D.pcm'}} \ - expected-remark-re{{building module 'A' as '{{.*}}/A.pcm'}} \ + expected-remark-re{{importing module 'A' from '{{.*[/\\]}}A.pcm'}} \ + expected-remark-re{{importing module 'B' into 'A' from '{{.*[/\\]}}B.pcm'}} \ + expected-remark-re{{importing module 'C' into 'B' from '{{.*[/\\]}}C.pcm'}} \ + expected-remark-re{{importing module 'D' into 'C' from '{{.*[/\\]}}D.pcm'}} \ + expected-remark-re{{building module 'A' as '{{.*[/\\]}}A.pcm'}} \ expected-remark{{finished building module 'A'}} \ - expected-remark-re{{importing module 'A' from '{{.*}}/A.pcm'}} \ - expected-remark-re{{importing module 'B' into 'A' from '{{.*}}/B.pcm'}} \ - expected-remark-re{{importing module 'C' into 'B' from '{{.*}}/C.pcm'}} \ - expected-remark-re{{importing module 'D' into 'C' from '{{.*}}/D.pcm'}} -// CHECK: remark: importing module 'A' from '{{.*}}/A.pcm' -// CHECK: remark: importing module 'B' into 'A' from '{{.*}}/B.pcm' -// CHECK: remark: importing module 'C' into 'B' from '{{.*}}/C.pcm' -// CHECK: remark: importing module 'D' into 'C' from '{{.*}}/D.pcm' + expected-remark-re{{importing module 'A' from '{{.*[/\\]}}A.pcm'}} \ + expected-remark-re{{importing module 'B' into 'A' from '{{.*[/\\]}}B.pcm'}} \ + expected-remark-re{{importing module 'C' into 'B' from '{{.*[/\\]}}C.pcm'}} \ + expected-remark-re{{importing module 'D' into 'C' from '{{.*[/\\]}}D.pcm'}} +// CHECK: remark: importing module 'A' from '{{.*[/\\]}}A.pcm' +// CHECK: remark: importing module 'B' into 'A' from '{{.*[/\\]}}B.pcm' +// CHECK: remark: importing module 'C' into 'B' from '{{.*[/\\]}}C.pcm' +// CHECK: remark: importing module 'D' into 'C' from '{{.*[/\\]}}D.pcm' // CHECK: remark: building module 'A' // CHECK: remark: building module 'B' // CHECK: remark: building module 'C' // CHECK: remark: building module 'D' // CHECK: remark: finished building module 'D' -// CHECK: remark: importing module 'D' from '{{.*}}/D.pcm' +// CHECK: remark: importing module 'D' from '{{.*[/\\]}}D.pcm' // CHECK: remark: finished building module 'C' -// CHECK: remark: importing module 'C' from '{{.*}}/C.pcm' -// CHECK: remark: importing module 'D' into 'C' from '{{.*}}/D.pcm' +// CHECK: remark: importing module 'C' from '{{.*[/\\]}}C.pcm' +// CHECK: remark: importing module 'D' into 'C' from '{{.*[/\\]}}D.pcm' // CHECK: remark: finished building module 'B' -// CHECK: remark: importing module 'B' from '{{.*}}/B.pcm' -// CHECK: remark: importing module 'C' into 'B' from '{{.*}}/C.pcm' -// CHECK: remark: importing module 'D' into 'C' from '{{.*}}/D.pcm' +// CHECK: remark: importing module 'B' from '{{.*[/\\]}}B.pcm' +// CHECK: remark: importing module 'C' into 'B' from '{{.*[/\\]}}C.pcm' +// CHECK: remark: importing module 'D' into 'C' from '{{.*[/\\]}}D.pcm' // CHECK: remark: finished building module 'A' -// CHECK: remark: importing module 'A' from '{{.*}}/A.pcm' -// CHECK: remark: importing module 'B' into 'A' from '{{.*}}/B.pcm' -// CHECK: remark: importing module 'C' into 'B' from '{{.*}}/C.pcm' -// CHECK: remark: importing module 'D' into 'C' from '{{.*}}/D.pcm' +// CHECK: remark: importing module 'A' from '{{.*[/\\]}}A.pcm' +// CHECK: remark: importing module 'B' into 'A' from '{{.*[/\\]}}B.pcm' +// CHECK: remark: importing module 'C' into 'B' from '{{.*[/\\]}}C.pcm' +// CHECK: remark: importing module 'D' into 'C' from '{{.*[/\\]}}D.pcm' diff --git a/clang/test/Modules/relative-import-path.c b/clang/test/Modules/relative-import-path.c index 3bcb3435fde..4d988d89c32 100644 --- a/clang/test/Modules/relative-import-path.c +++ b/clang/test/Modules/relative-import-path.c @@ -16,11 +16,11 @@ // CHECK: remark: building module 'B' // CHECK: remark: building module 'C' // CHECK: remark: finished building module 'C' -// CHECK: remark: importing module 'C' from '[[WORKDIR]]/cache/C.pcm' +// CHECK: remark: importing module 'C' from '[[WORKDIR]]{{[/\\]cache[/\\]}}C.pcm' // CHECK: remark: finished building module 'B' -// CHECK: remark: importing module 'B' from '[[WORKDIR]]/cache/B.pcm' -// CHECK: remark: importing module 'C' into 'B' from '[[WORKDIR]]/cache/C.pcm' +// CHECK: remark: importing module 'B' from '[[WORKDIR]]{{[/\\]cache[/\\]}}B.pcm' +// CHECK: remark: importing module 'C' into 'B' from '[[WORKDIR]]{{[/\\]cache[/\\]}}C.pcm' // CHECK: remark: finished building module 'A' -// CHECK: remark: importing module 'A' from '[[WORKDIR]]/cache/A.pcm' -// CHECK: remark: importing module 'B' into 'A' from '[[WORKDIR]]/cache/B.pcm' -// CHECK: remark: importing module 'C' into 'B' from '[[WORKDIR]]/cache/C.pcm' +// CHECK: remark: importing module 'A' from '[[WORKDIR]]{{[/\\]cache[/\\]}}A.pcm' +// CHECK: remark: importing module 'B' into 'A' from '[[WORKDIR]]{{[/\\]cache[/\\]}}B.pcm' +// CHECK: remark: importing module 'C' into 'B' from '[[WORKDIR]]{{[/\\]cache[/\\]}}C.pcm' |
