[llvm] r341731 - Fix some of the PDB tests.

[Zachary Turner via llvm-commits]

Author: zturner
Date: Fri Sep  7 16:36:08 2018
New Revision: 341731

URL: http://llvm.org/viewvc/llvm-project?rev=341731&view=rev
Log:
Fix some of the PDB tests.

They were unintentionally calling DIA directly, which requires
Windows.  We need to pass the -native flag, and this then required
fixing up one or two tests.

Modified:
    llvm/trunk/lib/DebugInfo/PDB/Native/NativeCompilandSymbol.cpp
    llvm/trunk/test/DebugInfo/PDB/Native/pdb-native-compilands.test

Modified: llvm/trunk/lib/DebugInfo/PDB/Native/NativeCompilandSymbol.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/PDB/Native/NativeCompilandSymbol.cpp?rev=341731&r1=341730&r2=341731&view=diff
==============================================================================
--- llvm/trunk/lib/DebugInfo/PDB/Native/NativeCompilandSymbol.cpp (original)
+++ llvm/trunk/lib/DebugInfo/PDB/Native/NativeCompilandSymbol.cpp Fri Sep  7 16:36:08 2018
@@ -26,8 +26,6 @@ PDB_SymType NativeCompilandSymbol::getSy
 void NativeCompilandSymbol::dump(raw_ostream &OS, int Indent) const {
   NativeRawSymbol::dump(OS, Indent);
 
-  dumpSymbolField(OS, "baseType", static_cast<uint32_t>(getBuiltinType()),
-                  Indent);
   dumpSymbolField(OS, "lexicalParentId", 0, Indent);
   dumpSymbolField(OS, "libraryName", getLibraryName(), Indent);
   dumpSymbolField(OS, "name", getName(), Indent);

Modified: llvm/trunk/test/DebugInfo/PDB/Native/pdb-native-compilands.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/PDB/Native/pdb-native-compilands.test?rev=341731&r1=341730&r2=341731&view=diff
==============================================================================
--- llvm/trunk/test/DebugInfo/PDB/Native/pdb-native-compilands.test (original)
+++ llvm/trunk/test/DebugInfo/PDB/Native/pdb-native-compilands.test Fri Sep  7 16:36:08 2018
@@ -3,7 +3,7 @@
 ; RUN:   | FileCheck -check-prefix=EMPTY %s
 ; RUN: llvm-pdbutil pretty -native -compilands %p/../Inputs/big-read.pdb \
 ; RUN:   | FileCheck -check-prefix=BIGREAD %s
-; RUN: llvm-pdbutil diadump -compilands %p/../Inputs/empty.pdb \
+; RUN: llvm-pdbutil diadump -native -compilands %p/../Inputs/empty.pdb \
 ; RUN:   | FileCheck -check-prefix=DUMP %s
 
 ; Reference output was generated with the DIA reader to ensure that the
@@ -67,9 +67,9 @@ BIGREAD:  api-ms-win-crt-heap-l1-1-0.dll
 BIGREAD:  * Linker *
 
 DUMP:      {
-DUMP-NEXT:   symIndexId: 1
+DUMP-NEXT:   symIndexId: 2
 DUMP-NEXT:   symTag: 2
-DUMP-NEXT:   lexicalParentId: 2
+DUMP-NEXT:   lexicalParentId: 0
 DUMP-NEXT:   libraryName: d:\src\llvm\test\DebugInfo\PDB\Inputs\empty.obj
 DUMP-NEXT:   name: d:\src\llvm\test\DebugInfo\PDB\Inputs\empty.obj
 DUMP-NEXT:   editAndContinueEnabled: 0
@@ -77,7 +77,7 @@ DUMP-NEXT: }
 DUMP-NEXT: {
 DUMP-NEXT:   symIndexId: 3
 DUMP-NEXT:   symTag: 2
-DUMP-NEXT:   lexicalParentId: 2
+DUMP-NEXT:   lexicalParentId: 0
 DUMP-NEXT:   libraryName:
 DUMP-NEXT:   name: * Linker *
 DUMP-NEXT:   editAndContinueEnabled: 0