Fix PDB injected sources test.

This test was originally disabled because it was failing on a bot.
It turns out I had run dos2unix on the file, and that removed a
necessary byte from the file.  I'm just recomitting the proper
file and updating the test to test a little bit more now.

llvm-svn: 327679

diff --git a/llvm/test/tools/llvm-pdbdump/Inputs/InjectedSource.pdb b/llvm/test/tools/llvm-pdbdump/Inputs/InjectedSource.pdb
index 518a8f4..3c3cc42 100644 (file)
Binary files a/llvm/test/tools/llvm-pdbdump/Inputs/InjectedSource.pdb and b/llvm/test/tools/llvm-pdbdump/Inputs/InjectedSource.pdb differ

diff --git a/llvm/test/tools/llvm-pdbdump/injected-sources.test b/llvm/test/tools/llvm-pdbdump/injected-sources.test
index fca717b..c04422e 100644 (file)
--- a/llvm/test/tools/llvm-pdbdump/injected-sources.test
+++ b/llvm/test/tools/llvm-pdbdump/injected-sources.test
@@ -1,19 +1,29 @@
 ; The PDB committed to the repo does not seem to be recognized by older
 ; versions of DIA SDK, so we xfail the test temporarily until we can
 ; figure out how to get a PDB that makes all versions of MSVC happy.
-; XFAIL: *
 ; RUN: llvm-pdbutil pretty -injected-sources -injected-source-content \
 ; RUN:   %p/Inputs/InjectedSource.pdb | FileCheck %s
 ; RUN: llvm-pdbutil pretty -injected-sources -injected-source-content \
 ; RUN:   %p/Inputs/ClassLayoutTest.pdb | FileCheck --check-prefix=NEGATIVE %s
 
 ; CHECK:      ---INJECTED SOURCES---
-; CHECK-NEXT: d:\sandbox\natvistest\natvistest\test.natvis (220 bytes): obj=<null>, vname=d:\sandbox\natvistest\natvistest\test.natvis, crc=2374979362, compression=None
+; CHECK:      c.natvis (140 bytes): obj=<null>, vname=c.natvis, crc=334478030, compression=None
 ; CHECK-NEXT: <?xml version="1.0" encoding="utf-8"?>
 ; CHECK-NEXT: <AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
-; CHECK-NEXT:   <Type Name="Foo">
-; CHECK-NEXT:     <DisplayString>This is a test</DisplayString>
-; CHECK-NEXT:   </Type>
+; CHECK-NEXT: </AutoVisualizer>
+; CHECK:      a.natvis (140 bytes): obj=<null>, vname=a.natvis, crc=334478030, compression=None
+; CHECK-NEXT: <?xml version="1.0" encoding="utf-8"?>
+; CHECK-NEXT: <AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
+; CHECK-NEXT: </AutoVisualizer>
+; CHECK:      b.natvis (294 bytes): obj=<null>, vname=b.natvis, crc=2059731902, compression=None
+; CHECK-NEXT: <?xml version="1.0" encoding="utf-8"?>
+; CHECK-NEXT: <AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
+; CHECK-NEXT: <Type Name="Baz">
+; CHECK-NEXT:   <DisplayString>Third test</DisplayString>
+; CHECK-NEXT: </Type>
+; CHECK-NEXT: <Type Name="Buzz">
+; CHECK-NEXT:   <DisplayString>Fourth test</DisplayString>
+; CHECK-NEXT: </Type>
 ; CHECK-NEXT: </AutoVisualizer>
 
 ; NEGATIVE:      ---INJECTED SOURCES---