From: Richard Smith <richard-llvm@metafoo.co.uk>
Date: Sat, 23 Nov 2013 05:21:32 +0000 (+0000)
Subject: Fix module name collision in tests.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=641304eaf1b52425148ba2f646b74eada6ce4280;p=clang

Fix module name collision in tests.


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

diff --git a/test/Modules/Inputs/malformed/module.map b/test/Modules/Inputs/malformed/module.map
index 8fb6d7bd7d..5277ffa41e 100644
--- a/test/Modules/Inputs/malformed/module.map
+++ b/test/Modules/Inputs/malformed/module.map
@@ -1,8 +1,8 @@
-module a {
+module malformed_a {
   module a1 { header "a1.h" }
   module a2 { header "a2.h" }
 }
-module b {
+module malformed_b {
   module b1 { header "b1.h" }
   module b2 { header "b2.h" }
 }
diff --git a/test/Modules/malformed.cpp b/test/Modules/malformed.cpp
index 705d289853..cd7b334939 100644
--- a/test/Modules/malformed.cpp
+++ b/test/Modules/malformed.cpp
@@ -6,18 +6,18 @@
 #define STR(x) STR2(x)
 #include STR(HEADER)
 
-// CHECK-A: While building module 'a'
+// CHECK-A: While building module 'malformed_a'
 // CHECK-A: a1.h:1:{{.*}} error: expected '}'
 // CHECK-A: a1.h:1:{{.*}} note: to match this '{'
 //
-// CHECK-A: While building module 'a'
+// CHECK-A: While building module 'malformed_a'
 // CHECK-A: a2.h:1:{{.*}} error: extraneous closing brace
 
-// CHECK-B: While building module 'b'
+// CHECK-B: While building module 'malformed_b'
 // CHECK-B: b1.h:2:{{.*}} error: expected '}'
 // CHECK-B: b1.h:1:{{.*}} note: to match this '{'
 // CHECK-B: b1.h:3:{{.*}} error: extraneous closing brace ('}')
 //
-// CHECK-B: While building module 'b'
+// CHECK-B: While building module 'malformed_b'
 // CHECK-B: b2.h:1:{{.*}} error: redefinition of 'g'
 // CHECK-B: b2.h:1:{{.*}} note: previous definition is here