From 4ae5b052483e30af0534909a0845fd891edf6235 Mon Sep 17 00:00:00 2001 From: NAKAMURA Takumi Date: Sun, 9 Aug 2015 22:55:50 +0000 Subject: [PATCH] clang/test/Modules: Satisfy win32 hosts due to dospath issue. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@244427 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/Modules/dependency-gen.modulemap | 2 +- test/Modules/explicit-build.cpp | 2 +- test/Modules/relative-dep-gen.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/Modules/dependency-gen.modulemap b/test/Modules/dependency-gen.modulemap index ace1177a3e..ed9f19c31e 100644 --- a/test/Modules/dependency-gen.modulemap +++ b/test/Modules/dependency-gen.modulemap @@ -39,5 +39,5 @@ extern module "test-base" "Inputs/dependency-gen-base.modulemap" // EXPLICIT-FIXME: {{.*}}/base.pcm // // EXPLICIT: {{^}}explicit.pcm: -// EXPLICIT: {{.*}}/dependency-gen.modulemap +// EXPLICIT: {{.*[/\\]}}dependency-gen.modulemap // EXPLICIT: {{ |\.[/\\]}}Inputs{{[/\\]}}dependency-gen.h diff --git a/test/Modules/explicit-build.cpp b/test/Modules/explicit-build.cpp index 4f12581055..2a5b70dce6 100644 --- a/test/Modules/explicit-build.cpp +++ b/test/Modules/explicit-build.cpp @@ -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= diff --git a/test/Modules/relative-dep-gen.cpp b/test/Modules/relative-dep-gen.cpp index d82b5a18b1..1c728a9906 100644 --- a/test/Modules/relative-dep-gen.cpp +++ b/test/Modules/relative-dep-gen.cpp @@ -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 -- 2.40.0