diff options
| author | David Blaikie <dblaikie@gmail.com> | 2016-05-16 20:42:27 +0000 |
|---|---|---|
| committer | David Blaikie <dblaikie@gmail.com> | 2016-05-16 20:42:27 +0000 |
| commit | d1f7ab3396d0ad8f5121f83e4109130b02002b05 (patch) | |
| tree | 90bd89c39295cd764d519a5d605dbb4a0703c694 /llvm/test/tools/llvm-dwp/X86/duplicate.test | |
| parent | e897f56da86c355505a3738912a57ea1c26df80a (diff) | |
| download | bcm5719-llvm-d1f7ab3396d0ad8f5121f83e4109130b02002b05.tar.gz bcm5719-llvm-d1f7ab3396d0ad8f5121f83e4109130b02002b05.zip | |
llvm-dwp: Streamline duplicate DWO ID diagnostic handling
Actually use the error return path rather than printing the duplicate
information then a separate error. But also just tidy up/deduplicate
some of the code for generating the diagnostic text.
llvm-svn: 269692
Diffstat (limited to 'llvm/test/tools/llvm-dwp/X86/duplicate.test')
| -rw-r--r-- | llvm/test/tools/llvm-dwp/X86/duplicate.test | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/llvm/test/tools/llvm-dwp/X86/duplicate.test b/llvm/test/tools/llvm-dwp/X86/duplicate.test index 67b68294789..43266a24b60 100644 --- a/llvm/test/tools/llvm-dwp/X86/duplicate.test +++ b/llvm/test/tools/llvm-dwp/X86/duplicate.test @@ -18,10 +18,10 @@ RUN: | FileCheck --check-prefix=DWO1DWP %s Build from a, b, and c.c all containing a single void() func by the name of the file. -DWOS: Duplicate DWO ID ({{.*}}) in 'c.c' and 'c.c'{{$}} -1DWP: Duplicate DWO ID ({{.*}}) in 'c.c' (from '{{.*}}ac.dwp') and 'c.c'{{$}} -2DWP: Duplicate DWO ID ({{.*}}) in 'c.c' and 'c.c' (from '{{.*}}bc.dwp'){{$}} +DWOS: error: Duplicate DWO ID ({{.*}}) in 'c.c' and 'c.c'{{$}} +1DWP: error: Duplicate DWO ID ({{.*}}) in 'c.c' (from '{{.*}}ac.dwp') and 'c.c'{{$}} +2DWP: error: Duplicate DWO ID ({{.*}}) in 'c.c' and 'c.c' (from '{{.*}}bc.dwp'){{$}} -DWODWOS: Duplicate DWO ID ({{.*}}) in 'c.c' and 'c.c'{{$}} -DWO1DWP: Duplicate DWO ID ({{.*}}) in 'c.c' (from 'c.dwo' in '{{.*}}ac.dwp') and 'c.c'{{$}} -DWO2DWP: Duplicate DWO ID ({{.*}}) in 'c.c' and 'c.c' (from 'c.dwo' in '{{.*}}bc.dwp'){{$}} +DWODWOS: error: Duplicate DWO ID ({{.*}}) in 'c.c' and 'c.c'{{$}} +DWO1DWP: error: Duplicate DWO ID ({{.*}}) in 'c.c' (from 'c.dwo' in '{{.*}}ac.dwp') and 'c.c'{{$}} +DWO2DWP: error: Duplicate DWO ID ({{.*}}) in 'c.c' and 'c.c' (from 'c.dwo' in '{{.*}}bc.dwp'){{$}} |
