r244427 - clang/test/Modules: Satisfy win32 hosts due to dospath issue.

NAKAMURA Takumi via cfe-commits cfe-commits at lists.llvm.org
Sun Aug 9 15:55:51 PDT 2015


Author: chapuni
Date: Sun Aug  9 17:55:50 2015
New Revision: 244427

URL: http://llvm.org/viewvc/llvm-project?rev=244427&view=rev
Log:
clang/test/Modules: Satisfy win32 hosts due to dospath issue.

Modified:
    cfe/trunk/test/Modules/dependency-gen.modulemap
    cfe/trunk/test/Modules/explicit-build.cpp
    cfe/trunk/test/Modules/relative-dep-gen.cpp

Modified: cfe/trunk/test/Modules/dependency-gen.modulemap
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/dependency-gen.modulemap?rev=244427&r1=244426&r2=244427&view=diff
==============================================================================
--- cfe/trunk/test/Modules/dependency-gen.modulemap (original)
+++ cfe/trunk/test/Modules/dependency-gen.modulemap Sun Aug  9 17:55:50 2015
@@ -39,5 +39,5 @@ extern module "test-base" "Inputs/depend
 // EXPLICIT-FIXME: {{.*}}/base.pcm
 //
 // EXPLICIT: {{^}}explicit.pcm:
-// EXPLICIT: {{.*}}/dependency-gen.modulemap
+// EXPLICIT: {{.*[/\\]}}dependency-gen.modulemap
 // EXPLICIT: {{ |\.[/\\]}}Inputs{{[/\\]}}dependency-gen.h

Modified: cfe/trunk/test/Modules/explicit-build.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/explicit-build.cpp?rev=244427&r1=244426&r2=244427&view=diff
==============================================================================
--- cfe/trunk/test/Modules/explicit-build.cpp (original)
+++ cfe/trunk/test/Modules/explicit-build.cpp Sun Aug  9 17:55:50 2015
@@ -138,7 +138,7 @@
 // RUN:            -fmodule-map-file=%S/Inputs/explicit-build/module.modulemap \
 // RUN:            %s 2>&1 | FileCheck --check-prefix=CHECK-MULTIPLE-AS %s
 //
-// CHECK-MULTIPLE-AS: error: module 'a' is defined in both '{{.*}}/a{{.*}}.pcm' and '{{.*[/\\]}}a{{.*}}.pcm'
+// CHECK-MULTIPLE-AS: error: module 'a' is defined in both '{{.*[/\\]}}a{{.*}}.pcm' and '{{.*[/\\]}}a{{.*}}.pcm'
 
 // -------------------------------
 // Try to import a PCH with -fmodule-file=

Modified: cfe/trunk/test/Modules/relative-dep-gen.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/relative-dep-gen.cpp?rev=244427&r1=244426&r2=244427&view=diff
==============================================================================
--- cfe/trunk/test/Modules/relative-dep-gen.cpp (original)
+++ cfe/trunk/test/Modules/relative-dep-gen.cpp Sun Aug  9 17:55:50 2015
@@ -27,4 +27,4 @@
 // CHECK-USE: use.o:
 // CHECK-USE-DAG:   Inputs/relative-dep-gen{{(-cwd)?}}.modulemap
 // CHECK-USE-DAG:   relative-dep-gen.cpp
-// CHECK-USE-DAG:   Inputs/relative-dep-gen-1.h
+// CHECK-USE-DAG:   Inputs{{[/\\]}}relative-dep-gen-1.h




More information about the cfe-commits mailing list