[llvm] r327679 - Fix PDB injected sources test.

[Zachary Turner via llvm-commits]

Author: zturner
Date: Thu Mar 15 15:47:04 2018
New Revision: 327679

URL: http://llvm.org/viewvc/llvm-project?rev=327679&view=rev
Log:
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.

Modified:
    llvm/trunk/test/tools/llvm-pdbdump/Inputs/InjectedSource.pdb
    llvm/trunk/test/tools/llvm-pdbdump/injected-sources.test

Modified: llvm/trunk/test/tools/llvm-pdbdump/Inputs/InjectedSource.pdb
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-pdbdump/Inputs/InjectedSource.pdb?rev=327679&r1=327678&r2=327679&view=diff
==============================================================================
Binary files - no diff available.

Modified: llvm/trunk/test/tools/llvm-pdbdump/injected-sources.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-pdbdump/injected-sources.test?rev=327679&r1=327678&r2=327679&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-pdbdump/injected-sources.test (original)
+++ llvm/trunk/test/tools/llvm-pdbdump/injected-sources.test Thu Mar 15 15:47:04 2018
@@ -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---