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

[Duncan P. N. Exon Smith via cfe-commits]

Author: dexonsmith
Date: Sat Mar  9 11:33:32 2019
New Revision: 355779

URL: http://llvm.org/viewvc/llvm-project?rev=355779&view=rev
Log:
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 :/.

Modified:
    cfe/trunk/test/Modules/implicit-invalidate-chain.c
    cfe/trunk/test/Modules/relative-import-path.c

Modified: cfe/trunk/test/Modules/implicit-invalidate-chain.c
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/implicit-invalidate-chain.c?rev=355779&r1=355778&r2=355779&view=diff
==============================================================================
--- cfe/trunk/test/Modules/implicit-invalidate-chain.c (original)
+++ cfe/trunk/test/Modules/implicit-invalidate-chain.c Sat Mar  9 11:33:32 2019
@@ -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'

Modified: cfe/trunk/test/Modules/relative-import-path.c
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/relative-import-path.c?rev=355779&r1=355778&r2=355779&view=diff
==============================================================================
--- cfe/trunk/test/Modules/relative-import-path.c (original)
+++ cfe/trunk/test/Modules/relative-import-path.c Sat Mar  9 11:33:32 2019
@@ -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'


_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits