Fix slashes in path references in -Rmodule-import test from r355778

Fixup for r355778 to fix all the Windows bots.  Apparently I already
forgot the lesson from r355482 :/.

llvm-svn: 355779
This commit is contained in:
Duncan P. N. Exon Smith 2019-03-09 19:33:32 +00:00
parent 0a2be46cfd
commit 2fd0d227f6
2 changed files with 29 additions and 29 deletions

View File

@ -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'

View File

@ -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'