r195545 - Fix module name collision in tests.

Richard Smith richard-llvm at metafoo.co.uk
Fri Nov 22 21:21:33 PST 2013


Author: rsmith
Date: Fri Nov 22 23:21:32 2013
New Revision: 195545

URL: http://llvm.org/viewvc/llvm-project?rev=195545&view=rev
Log:
Fix module name collision in tests.

Modified:
    cfe/trunk/test/Modules/Inputs/malformed/module.map
    cfe/trunk/test/Modules/malformed.cpp

Modified: cfe/trunk/test/Modules/Inputs/malformed/module.map
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/malformed/module.map?rev=195545&r1=195544&r2=195545&view=diff
==============================================================================
--- cfe/trunk/test/Modules/Inputs/malformed/module.map (original)
+++ cfe/trunk/test/Modules/Inputs/malformed/module.map Fri Nov 22 23:21:32 2013
@@ -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" }
 }

Modified: cfe/trunk/test/Modules/malformed.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/malformed.cpp?rev=195545&r1=195544&r2=195545&view=diff
==============================================================================
--- cfe/trunk/test/Modules/malformed.cpp (original)
+++ cfe/trunk/test/Modules/malformed.cpp Fri Nov 22 23:21:32 2013
@@ -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





More information about the cfe-commits mailing list