From: Duncan P. N. Exon Smith <dexonsmith@apple.com>
Date: Wed, 6 Mar 2019 05:42:56 +0000 (+0000)
Subject: Fix slashes in path references in -Rmodule-import test from r355477
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=38f1a525822288cc0aec7b2470edb61c2a2c0188;p=clang

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

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@355482 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/test/Modules/Rmodule-import.m b/test/Modules/Rmodule-import.m
index 54e2d021f0..11a1615007 100644
--- a/test/Modules/Rmodule-import.m
+++ b/test/Modules/Rmodule-import.m
@@ -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'