r355482 - Fix slashes in path references in -Rmodule-import test from r355477

Duncan P. N. Exon Smith via cfe-commits cfe-commits at lists.llvm.org
Tue Mar 5 21:42:56 PST 2019


Author: dexonsmith
Date: Tue Mar  5 21:42:56 2019
New Revision: 355482

URL: http://llvm.org/viewvc/llvm-project?rev=355482&view=rev
Log:
Fix slashes in path references in -Rmodule-import test from r355477

Fixup for r355477 to fix the Windows bot:
  http://lab.llvm.org:8011/builders/llvm-clang-x86_64-expensive-checks-win/builds/16217

Modified:
    cfe/trunk/test/Modules/Rmodule-import.m

Modified: cfe/trunk/test/Modules/Rmodule-import.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Rmodule-import.m?rev=355482&r1=355481&r2=355482&view=diff
==============================================================================
--- cfe/trunk/test/Modules/Rmodule-import.m (original)
+++ cfe/trunk/test/Modules/Rmodule-import.m Tue Mar  5 21:42:56 2019
@@ -14,33 +14,33 @@
 // RUN: FileCheck %s -implicit-check-not "remark:"
 
 #include "A.h" // \
-   expected-remark-re{{building module 'A' as '{{.*}}/A.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 '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'}}
 // CHECK: remark: building module 'A'
 // CHECK: remark: building module 'B'
 // CHECK: remark: building module 'C'
 // CHECK: remark: finished building module 'C'
-// CHECK: remark: importing module 'C' from '{{.*}}/C.pcm'
+// CHECK: remark: importing module 'C' from '{{.*[/\\]}}C.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 'B' from '{{.*[/\\]}}B.pcm'
+// CHECK: remark: importing module 'C' into 'B' from '{{.*[/\\]}}C.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 'A' from '{{.*[/\\]}}A.pcm'
+// CHECK: remark: importing module 'B' into 'A' from '{{.*[/\\]}}B.pcm'
+// CHECK: remark: importing module 'C' into 'B' from '{{.*[/\\]}}C.pcm'
 #include "B.h" // \
-   expected-remark-re{{importing module 'B' from '{{.*}}/B.pcm'}}
-// CHECK: remark: importing module 'B' from '{{.*}}/B.pcm'
+   expected-remark-re{{importing module 'B' from '{{.*[/\\]}}B.pcm'}}
+// CHECK: remark: importing module 'B' from '{{.*[/\\]}}B.pcm'
 #include "C.h" // \
-   expected-remark-re{{importing module 'C' from '{{.*}}/C.pcm'}}
-// CHECK: remark: importing module 'C' from '{{.*}}/C.pcm'
+   expected-remark-re{{importing module 'C' from '{{.*[/\\]}}C.pcm'}}
+// CHECK: remark: importing module 'C' from '{{.*[/\\]}}C.pcm'
 @import D; // \
-   expected-remark-re{{building module 'D' as '{{.*}}/D.pcm'}} \
+   expected-remark-re{{building module 'D' as '{{.*[/\\]}}D.pcm'}} \
    expected-remark{{finished building module 'D'}} \
-   expected-remark-re{{importing module 'D' from '{{.*}}/D.pcm'}}
+   expected-remark-re{{importing module 'D' from '{{.*[/\\]}}D.pcm'}}
 // 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'




More information about the cfe-commits mailing list