Author: dyung
Date: Thu Apr 5 15:58:14 2018
New Revision: 329361
URL: http://llvm.org/viewvc/llvm-project?rev=329361&view=rev
Log:
Fix test added in r329301 to work properly with Windows paths.
Modified:
cfe/trunk/test/ASTMerge/struct/test.c
Modified: cfe/trunk/test/ASTMerge/struct/test.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ASTMerge/struct/test.c?rev=329361&r1=329360&r2=329361&view=diff
==============================================================================
--- cfe/trunk/test/ASTMerge/struct/test.c (original)
+++ cfe/trunk/test/ASTMerge/struct/test.c Thu Apr 5 15:58:14 2018
@@ -44,12 +44,12 @@
// CHECK: struct2.c:72:7: note: field 'i' has type 'int' here
// CHECK: struct2.c:76:5: error: external variable 'x13' declared with
incompatible types in different translation units ('S13' vs. 'S13')
// CHECK: struct1.c:79:5: note: declared here with type 'S13'
-// CHECK: struct1.c:130:7: warning: type 'struct DeepUnnamedError::(anonymous
at [[PATH_TO_INPUTS:.+]]/struct1.c:130:7)' has incompatible definitions in
different translation units
+// CHECK: struct1.c:130:7: warning: type 'struct DeepUnnamedError::(anonymous
at [[PATH_TO_INPUTS:.+]]struct1.c:130:7)' has incompatible definitions in
different translation units
// CHECK: struct1.c:131:14: note: field 'i' has type 'long' here
// CHECK: struct2.c:128:15: note: field 'i' has type 'float' here
-// CHECK: struct1.c:129:5: warning: type 'union DeepUnnamedError::(anonymous
at [[PATH_TO_INPUTS]]/struct1.c:129:5)' has incompatible definitions in
different translation units
-// CHECK: struct1.c:132:9: note: field 'S' has type 'struct (anonymous struct
at [[PATH_TO_INPUTS]]/struct1.c:130:7)' here
-// CHECK: struct2.c:129:9: note: field 'S' has type 'struct (anonymous struct
at [[PATH_TO_INPUTS]]/struct2.c:127:7)' here
+// CHECK: struct1.c:129:5: warning: type 'union DeepUnnamedError::(anonymous
at [[PATH_TO_INPUTS]]struct1.c:129:5)' has incompatible definitions in
different translation units
+// CHECK: struct1.c:132:9: note: field 'S' has type 'struct (anonymous struct
at [[PATH_TO_INPUTS]]struct1.c:130:7)' here
+// CHECK: struct2.c:129:9: note: field 'S' has type 'struct (anonymous struct
at [[PATH_TO_INPUTS]]struct2.c:127:7)' here
// CHECK: struct2.c:138:3: error: external variable 'x16' declared with
incompatible types in different translation units ('struct DeepUnnamedError'
vs. 'struct DeepUnnamedError')
// CHECK: struct1.c:141:3: note: declared here with type 'struct
DeepUnnamedError'
// CHECK: 11 warnings and 9 errors generated
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
