diff options
| author | John Thompson <John.Thompson.JTSoftware@gmail.com> | 2013-03-28 01:20:19 +0000 |
|---|---|---|
| committer | John Thompson <John.Thompson.JTSoftware@gmail.com> | 2013-03-28 01:20:19 +0000 |
| commit | 8a2f7a8e0dc6242d1bfd4004555f81834d4a1b95 (patch) | |
| tree | f2d8cedbcdfd6c93b6d20244ebb920f23467894f /test/modularize | |
| parent | 8668703d3dbfc37ce2d49e430c37aec79d8fba42 (diff) | |
modularize - revised to group duplicate symbols together in the error output.
git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@178207 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/modularize')
| -rw-r--r-- | test/modularize/ProblemsDuplicate.modularize | 4 | ||||
| -rw-r--r-- | test/modularize/ProblemsInconsistent.modularize | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/test/modularize/ProblemsDuplicate.modularize b/test/modularize/ProblemsDuplicate.modularize index 43469e08..e53657ca 100644 --- a/test/modularize/ProblemsDuplicate.modularize +++ b/test/modularize/ProblemsDuplicate.modularize @@ -3,4 +3,6 @@ Inputs/DuplicateHeader1.h Inputs/DuplicateHeader2.h -# CHECK: error: 'TypeInt' defined at both {{.*}}{{[/\\]}}Inputs{{[/\\]}}DuplicateHeader1.h:2:13 and {{.*}}{{[/\\]}}Inputs{{[/\\]}}DuplicateHeader2.h:2:13 +# CHECK: error: value 'TypeInt' defined at multiple locations: +# CHECK-NEXT: {{.*}}{{[/\\]}}Inputs{{[/\\]}}DuplicateHeader1.h:2:13 +# CHECK-NEXT: {{.*}}{{[/\\]}}Inputs{{[/\\]}}DuplicateHeader2.h:2:13
\ No newline at end of file diff --git a/test/modularize/ProblemsInconsistent.modularize b/test/modularize/ProblemsInconsistent.modularize index dfe03208..fe907b16 100644 --- a/test/modularize/ProblemsInconsistent.modularize +++ b/test/modularize/ProblemsInconsistent.modularize @@ -3,7 +3,9 @@ Inputs/InconsistentHeader1.h Inputs/InconsistentHeader2.h -# CHECK: error: 'SYMBOL' defined at both {{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentSubHeader.h:3:9 and {{.*}}{{[/\\]}}Inputs/InconsistentSubHeader.h:6:9 +# CHECK: error: macro 'SYMBOL' defined at multiple locations: +# CHECK-NEXT: {{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentSubHeader.h:3:9 +# CHECK-NEXT: {{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentSubHeader.h:6:9 # CHECK-NEXT: error: header '{{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentSubHeader.h' has different contents dependening on how it was included # CHECK-NEXT: note: 'SYMBOL' in {{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentSubHeader.h at 3:9 not always provided # CHECK-NEXT: note: 'SYMBOL' in {{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentSubHeader.h at 6:9 not always provided |