<div dir="ltr">Hi Michal,<div>It looks like this patch may have broken this bot. </div><div><br></div><div><a href="http://lab.llvm.org:8080/green/job/lldb_build_test/23767/consoleFull#-1083450927b825e790-484f-4586-af29-73c4754ff671">http://lab.llvm.org:8080/green/job/lldb_build_test/23767/consoleFull#-1083450927b825e790-484f-4586-af29-73c4754ff671</a><br></div><div><br></div><div>What do you think?</div></div><br><div class="gmail_quote"><div dir="ltr">On Mon, Jan 2, 2017 at 10:31 AM Michal Gorny via lldb-commits <<a href="mailto:lldb-commits@lists.llvm.org">lldb-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: mgorny<br class="gmail_msg">
Date: Mon Jan  2 12:20:33 2017<br class="gmail_msg">
New Revision: 290819<br class="gmail_msg">
<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=290819&view=rev" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project?rev=290819&view=rev</a><br class="gmail_msg">
Log:<br class="gmail_msg">
[unittests] Split DWARF tests out of PDB, fix standalone build<br class="gmail_msg">
<br class="gmail_msg">
Split the PDB tests into DWARF test and actual PDB tests, the latter<br class="gmail_msg">
requiring DIA SDK. Use the new LLVMConfig.cmake LLVM_ENABLE_DIA_SDK<br class="gmail_msg">
symbol to enable the PDB tests rather than relying on<br class="gmail_msg">
llvm/Config/config.h private include file that is not available when<br class="gmail_msg">
building standalone.<br class="gmail_msg">
<br class="gmail_msg">
Differential Revision: <a href="https://reviews.llvm.org/D26249" rel="noreferrer" class="gmail_msg" target="_blank">https://reviews.llvm.org/D26249</a><br class="gmail_msg">
<br class="gmail_msg">
Added:<br class="gmail_msg">
    lldb/trunk/unittests/SymbolFile/DWARF/<br class="gmail_msg">
    lldb/trunk/unittests/SymbolFile/DWARF/CMakeLists.txt<br class="gmail_msg">
    lldb/trunk/unittests/SymbolFile/DWARF/Inputs/<br class="gmail_msg">
    lldb/trunk/unittests/SymbolFile/DWARF/Inputs/test-dwarf.cpp<br class="gmail_msg">
      - copied, changed from r290688, lldb/trunk/unittests/SymbolFile/PDB/Inputs/test-dwarf.cpp<br class="gmail_msg">
    lldb/trunk/unittests/SymbolFile/DWARF/Inputs/test-dwarf.exe<br class="gmail_msg">
      - copied, changed from r290688, lldb/trunk/unittests/SymbolFile/PDB/Inputs/test-dwarf.exe<br class="gmail_msg">
    lldb/trunk/unittests/SymbolFile/DWARF/SymbolFileDWARFTests.cpp<br class="gmail_msg">
Removed:<br class="gmail_msg">
    lldb/trunk/unittests/SymbolFile/PDB/Inputs/test-dwarf.cpp<br class="gmail_msg">
    lldb/trunk/unittests/SymbolFile/PDB/Inputs/test-dwarf.exe<br class="gmail_msg">
Modified:<br class="gmail_msg">
    lldb/trunk/unittests/SymbolFile/CMakeLists.txt<br class="gmail_msg">
    lldb/trunk/unittests/SymbolFile/PDB/CMakeLists.txt<br class="gmail_msg">
    lldb/trunk/unittests/SymbolFile/PDB/SymbolFilePDBTests.cpp<br class="gmail_msg">
<br class="gmail_msg">
Modified: lldb/trunk/unittests/SymbolFile/CMakeLists.txt<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/SymbolFile/CMakeLists.txt?rev=290819&r1=290818&r2=290819&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/SymbolFile/CMakeLists.txt?rev=290819&r1=290818&r2=290819&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- lldb/trunk/unittests/SymbolFile/CMakeLists.txt (original)<br class="gmail_msg">
+++ lldb/trunk/unittests/SymbolFile/CMakeLists.txt Mon Jan  2 12:20:33 2017<br class="gmail_msg">
@@ -1 +1,4 @@<br class="gmail_msg">
-add_subdirectory(PDB)<br class="gmail_msg">
+add_subdirectory(DWARF)<br class="gmail_msg">
+if (LLVM_ENABLE_DIA_SDK)<br class="gmail_msg">
+  add_subdirectory(PDB)<br class="gmail_msg">
+endif()<br class="gmail_msg">
<br class="gmail_msg">
Added: lldb/trunk/unittests/SymbolFile/DWARF/CMakeLists.txt<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/SymbolFile/DWARF/CMakeLists.txt?rev=290819&view=auto" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/SymbolFile/DWARF/CMakeLists.txt?rev=290819&view=auto</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- lldb/trunk/unittests/SymbolFile/DWARF/CMakeLists.txt (added)<br class="gmail_msg">
+++ lldb/trunk/unittests/SymbolFile/DWARF/CMakeLists.txt Mon Jan  2 12:20:33 2017<br class="gmail_msg">
@@ -0,0 +1,8 @@<br class="gmail_msg">
+add_lldb_unittest(SymbolFileDWARFTests<br class="gmail_msg">
+  SymbolFileDWARFTests.cpp<br class="gmail_msg">
+  )<br class="gmail_msg">
+<br class="gmail_msg">
+set(test_inputs<br class="gmail_msg">
+   test-dwarf.exe)<br class="gmail_msg">
+<br class="gmail_msg">
+add_unittest_inputs(SymbolFileDWARFTests "${test_inputs}")<br class="gmail_msg">
<br class="gmail_msg">
Copied: lldb/trunk/unittests/SymbolFile/DWARF/Inputs/test-dwarf.cpp (from r290688, lldb/trunk/unittests/SymbolFile/PDB/Inputs/test-dwarf.cpp)<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/SymbolFile/DWARF/Inputs/test-dwarf.cpp?p2=lldb/trunk/unittests/SymbolFile/DWARF/Inputs/test-dwarf.cpp&p1=lldb/trunk/unittests/SymbolFile/PDB/Inputs/test-dwarf.cpp&r1=290688&r2=290819&rev=290819&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/SymbolFile/DWARF/Inputs/test-dwarf.cpp?p2=lldb/trunk/unittests/SymbolFile/DWARF/Inputs/test-dwarf.cpp&p1=lldb/trunk/unittests/SymbolFile/PDB/Inputs/test-dwarf.cpp&r1=290688&r2=290819&rev=290819&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
    (empty)<br class="gmail_msg">
<br class="gmail_msg">
Copied: lldb/trunk/unittests/SymbolFile/DWARF/Inputs/test-dwarf.exe (from r290688, lldb/trunk/unittests/SymbolFile/PDB/Inputs/test-dwarf.exe)<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/SymbolFile/DWARF/Inputs/test-dwarf.exe?p2=lldb/trunk/unittests/SymbolFile/DWARF/Inputs/test-dwarf.exe&p1=lldb/trunk/unittests/SymbolFile/PDB/Inputs/test-dwarf.exe&r1=290688&r2=290819&rev=290819&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/SymbolFile/DWARF/Inputs/test-dwarf.exe?p2=lldb/trunk/unittests/SymbolFile/DWARF/Inputs/test-dwarf.exe&p1=lldb/trunk/unittests/SymbolFile/PDB/Inputs/test-dwarf.exe&r1=290688&r2=290819&rev=290819&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
    (empty)<br class="gmail_msg">
<br class="gmail_msg">
Added: lldb/trunk/unittests/SymbolFile/DWARF/SymbolFileDWARFTests.cpp<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/SymbolFile/DWARF/SymbolFileDWARFTests.cpp?rev=290819&view=auto" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/SymbolFile/DWARF/SymbolFileDWARFTests.cpp?rev=290819&view=auto</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- lldb/trunk/unittests/SymbolFile/DWARF/SymbolFileDWARFTests.cpp (added)<br class="gmail_msg">
+++ lldb/trunk/unittests/SymbolFile/DWARF/SymbolFileDWARFTests.cpp Mon Jan  2 12:20:33 2017<br class="gmail_msg">
@@ -0,0 +1,83 @@<br class="gmail_msg">
+//===-- PythonDataObjectsTests.cpp ------------------------------*- C++ -*-===//<br class="gmail_msg">
+//<br class="gmail_msg">
+//                     The LLVM Compiler Infrastructure<br class="gmail_msg">
+//<br class="gmail_msg">
+// This file is distributed under the University of Illinois Open Source<br class="gmail_msg">
+// License. See LICENSE.TXT for details.<br class="gmail_msg">
+//<br class="gmail_msg">
+//===----------------------------------------------------------------------===//<br class="gmail_msg">
+<br class="gmail_msg">
+#include "gtest/gtest.h"<br class="gmail_msg">
+<br class="gmail_msg">
+#include "llvm/ADT/STLExtras.h"<br class="gmail_msg">
+#include "llvm/DebugInfo/PDB/PDBSymbolData.h"<br class="gmail_msg">
+#include "llvm/DebugInfo/PDB/PDBSymbolExe.h"<br class="gmail_msg">
+#include "llvm/Support/FileSystem.h"<br class="gmail_msg">
+#include "llvm/Support/Path.h"<br class="gmail_msg">
+<br class="gmail_msg">
+#include "lldb/Core/Address.h"<br class="gmail_msg">
+#include "lldb/Core/ArchSpec.h"<br class="gmail_msg">
+#include "lldb/Core/Module.h"<br class="gmail_msg">
+#include "lldb/Core/ModuleSpec.h"<br class="gmail_msg">
+#include "lldb/Host/FileSpec.h"<br class="gmail_msg">
+#include "lldb/Host/HostInfo.h"<br class="gmail_msg">
+#include "lldb/Symbol/ClangASTContext.h"<br class="gmail_msg">
+#include "lldb/Symbol/CompileUnit.h"<br class="gmail_msg">
+#include "lldb/Symbol/LineTable.h"<br class="gmail_msg">
+#include "lldb/Symbol/SymbolVendor.h"<br class="gmail_msg">
+<br class="gmail_msg">
+#include "Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h"<br class="gmail_msg">
+#include "Plugins/SymbolFile/DWARF/SymbolFileDWARF.h"<br class="gmail_msg">
+#include "Plugins/SymbolFile/PDB/SymbolFilePDB.h"<br class="gmail_msg">
+<br class="gmail_msg">
+extern const char *TestMainArgv0;<br class="gmail_msg">
+<br class="gmail_msg">
+using namespace lldb_private;<br class="gmail_msg">
+<br class="gmail_msg">
+class SymbolFileDWARFTests : public testing::Test {<br class="gmail_msg">
+public:<br class="gmail_msg">
+  void SetUp() override {<br class="gmail_msg">
+// Initialize and TearDown the plugin every time, so we get a brand new<br class="gmail_msg">
+// AST every time so that modifications to the AST from each test don't<br class="gmail_msg">
+// leak into the next test.<br class="gmail_msg">
+    HostInfo::Initialize();<br class="gmail_msg">
+    ObjectFilePECOFF::Initialize();<br class="gmail_msg">
+    SymbolFileDWARF::Initialize();<br class="gmail_msg">
+    ClangASTContext::Initialize();<br class="gmail_msg">
+    SymbolFilePDB::Initialize();<br class="gmail_msg">
+<br class="gmail_msg">
+    llvm::StringRef exe_folder = llvm::sys::path::parent_path(TestMainArgv0);<br class="gmail_msg">
+    llvm::SmallString<128> inputs_folder = exe_folder;<br class="gmail_msg">
+    llvm::sys::path::append(inputs_folder, "Inputs");<br class="gmail_msg">
+<br class="gmail_msg">
+    m_dwarf_test_exe = inputs_folder;<br class="gmail_msg">
+    llvm::sys::path::append(m_dwarf_test_exe, "test-dwarf.exe");<br class="gmail_msg">
+  }<br class="gmail_msg">
+<br class="gmail_msg">
+  void TearDown() override {<br class="gmail_msg">
+    SymbolFilePDB::Terminate();<br class="gmail_msg">
+    ClangASTContext::Initialize();<br class="gmail_msg">
+    SymbolFileDWARF::Terminate();<br class="gmail_msg">
+    ObjectFilePECOFF::Terminate();<br class="gmail_msg">
+    HostInfo::Terminate();<br class="gmail_msg">
+  }<br class="gmail_msg">
+<br class="gmail_msg">
+protected:<br class="gmail_msg">
+  llvm::SmallString<128> m_dwarf_test_exe;<br class="gmail_msg">
+};<br class="gmail_msg">
+<br class="gmail_msg">
+TEST_F(SymbolFileDWARFTests, TestAbilitiesForDWARF) {<br class="gmail_msg">
+  // Test that when we have Dwarf debug info, SymbolFileDWARF is used.<br class="gmail_msg">
+  FileSpec fspec(m_dwarf_test_exe.c_str(), false);<br class="gmail_msg">
+  ArchSpec aspec("i686-pc-windows");<br class="gmail_msg">
+  lldb::ModuleSP module = std::make_shared<Module>(fspec, aspec);<br class="gmail_msg">
+<br class="gmail_msg">
+  SymbolVendor *plugin = module->GetSymbolVendor();<br class="gmail_msg">
+  EXPECT_NE(nullptr, plugin);<br class="gmail_msg">
+  SymbolFile *symfile = plugin->GetSymbolFile();<br class="gmail_msg">
+  EXPECT_NE(nullptr, symfile);<br class="gmail_msg">
+  EXPECT_EQ(symfile->GetPluginName(), SymbolFileDWARF::GetPluginNameStatic());<br class="gmail_msg">
+<br class="gmail_msg">
+  uint32_t expected_abilities = SymbolFile::kAllAbilities;<br class="gmail_msg">
+  EXPECT_EQ(expected_abilities, symfile->CalculateAbilities());<br class="gmail_msg">
+}<br class="gmail_msg">
<br class="gmail_msg">
Modified: lldb/trunk/unittests/SymbolFile/PDB/CMakeLists.txt<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/SymbolFile/PDB/CMakeLists.txt?rev=290819&r1=290818&r2=290819&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/SymbolFile/PDB/CMakeLists.txt?rev=290819&r1=290818&r2=290819&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- lldb/trunk/unittests/SymbolFile/PDB/CMakeLists.txt (original)<br class="gmail_msg">
+++ lldb/trunk/unittests/SymbolFile/PDB/CMakeLists.txt Mon Jan  2 12:20:33 2017<br class="gmail_msg">
@@ -5,8 +5,7 @@ add_lldb_unittest(SymbolFilePDBTests<br class="gmail_msg">
 set(test_inputs<br class="gmail_msg">
    test-pdb.exe<br class="gmail_msg">
    test-pdb.pdb<br class="gmail_msg">
-   test-dwarf.exe<br class="gmail_msg">
    test-pdb-types.exe<br class="gmail_msg">
    test-pdb-types.pdb)<br class="gmail_msg">
<br class="gmail_msg">
-add_unittest_inputs(SymbolFilePDBTests "${test_inputs}")<br class="gmail_msg">
+add_unittest_inputs(SymbolFilePDBTests "${test_inputs}")<br class="gmail_msg">
<br class="gmail_msg">
Removed: lldb/trunk/unittests/SymbolFile/PDB/Inputs/test-dwarf.cpp<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/SymbolFile/PDB/Inputs/test-dwarf.cpp?rev=290818&view=auto" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/SymbolFile/PDB/Inputs/test-dwarf.cpp?rev=290818&view=auto</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- lldb/trunk/unittests/SymbolFile/PDB/Inputs/test-dwarf.cpp (original)<br class="gmail_msg">
+++ lldb/trunk/unittests/SymbolFile/PDB/Inputs/test-dwarf.cpp (removed)<br class="gmail_msg">
@@ -1,6 +0,0 @@<br class="gmail_msg">
-// Compile with "cl /c /Zi /GR- test.cpp"<br class="gmail_msg">
-// Link with "link test.obj /debug /nodefaultlib /entry:main /out:test.exe"<br class="gmail_msg">
-<br class="gmail_msg">
-int __cdecl _purecall(void) { return 0; }<br class="gmail_msg">
-<br class="gmail_msg">
-int main(int argc, char **argv) { return 0; }<br class="gmail_msg">
<br class="gmail_msg">
Removed: lldb/trunk/unittests/SymbolFile/PDB/Inputs/test-dwarf.exe<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/SymbolFile/PDB/Inputs/test-dwarf.exe?rev=290818&view=auto" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/SymbolFile/PDB/Inputs/test-dwarf.exe?rev=290818&view=auto</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
Binary files lldb/trunk/unittests/SymbolFile/PDB/Inputs/test-dwarf.exe (original) and lldb/trunk/unittests/SymbolFile/PDB/Inputs/test-dwarf.exe (removed) differ<br class="gmail_msg">
<br class="gmail_msg">
Modified: lldb/trunk/unittests/SymbolFile/PDB/SymbolFilePDBTests.cpp<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/SymbolFile/PDB/SymbolFilePDBTests.cpp?rev=290819&r1=290818&r2=290819&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/SymbolFile/PDB/SymbolFilePDBTests.cpp?rev=290819&r1=290818&r2=290819&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- lldb/trunk/unittests/SymbolFile/PDB/SymbolFilePDBTests.cpp (original)<br class="gmail_msg">
+++ lldb/trunk/unittests/SymbolFile/PDB/SymbolFilePDBTests.cpp Mon Jan  2 12:20:33 2017<br class="gmail_msg">
@@ -10,7 +10,6 @@<br class="gmail_msg">
 #include "gtest/gtest.h"<br class="gmail_msg">
<br class="gmail_msg">
 #include "llvm/ADT/STLExtras.h"<br class="gmail_msg">
-#include "llvm/Config/config.h"<br class="gmail_msg">
 #include "llvm/DebugInfo/PDB/PDBSymbolData.h"<br class="gmail_msg">
 #include "llvm/DebugInfo/PDB/PDBSymbolExe.h"<br class="gmail_msg">
 #include "llvm/Support/FileSystem.h"<br class="gmail_msg">
@@ -63,10 +62,8 @@ public:<br class="gmail_msg">
     llvm::sys::path::append(inputs_folder, "Inputs");<br class="gmail_msg">
<br class="gmail_msg">
     m_pdb_test_exe = inputs_folder;<br class="gmail_msg">
-    m_dwarf_test_exe = inputs_folder;<br class="gmail_msg">
     m_types_test_exe = inputs_folder;<br class="gmail_msg">
     llvm::sys::path::append(m_pdb_test_exe, "test-pdb.exe");<br class="gmail_msg">
-    llvm::sys::path::append(m_dwarf_test_exe, "test-dwarf.exe");<br class="gmail_msg">
     llvm::sys::path::append(m_types_test_exe, "test-pdb-types.exe");<br class="gmail_msg">
   }<br class="gmail_msg">
<br class="gmail_msg">
@@ -84,7 +81,6 @@ public:<br class="gmail_msg">
<br class="gmail_msg">
 protected:<br class="gmail_msg">
   llvm::SmallString<128> m_pdb_test_exe;<br class="gmail_msg">
-  llvm::SmallString<128> m_dwarf_test_exe;<br class="gmail_msg">
   llvm::SmallString<128> m_types_test_exe;<br class="gmail_msg">
<br class="gmail_msg">
   bool FileSpecMatchesAsBaseOrFull(const FileSpec &left,<br class="gmail_msg">
@@ -154,29 +150,7 @@ protected:<br class="gmail_msg">
   }<br class="gmail_msg">
 };<br class="gmail_msg">
<br class="gmail_msg">
-#if HAVE_DIA_SDK<br class="gmail_msg">
-#define REQUIRES_DIA_SDK(TestName) TestName<br class="gmail_msg">
-#else<br class="gmail_msg">
-#define REQUIRES_DIA_SDK(TestName) DISABLED_##TestName<br class="gmail_msg">
-#endif<br class="gmail_msg">
-<br class="gmail_msg">
-TEST_F(SymbolFilePDBTests, TestAbilitiesForDWARF) {<br class="gmail_msg">
-  // Test that when we have Dwarf debug info, SymbolFileDWARF is used.<br class="gmail_msg">
-  FileSpec fspec(m_dwarf_test_exe.c_str(), false);<br class="gmail_msg">
-  ArchSpec aspec("i686-pc-windows");<br class="gmail_msg">
-  lldb::ModuleSP module = std::make_shared<Module>(fspec, aspec);<br class="gmail_msg">
-<br class="gmail_msg">
-  SymbolVendor *plugin = module->GetSymbolVendor();<br class="gmail_msg">
-  EXPECT_NE(nullptr, plugin);<br class="gmail_msg">
-  SymbolFile *symfile = plugin->GetSymbolFile();<br class="gmail_msg">
-  EXPECT_NE(nullptr, symfile);<br class="gmail_msg">
-  EXPECT_EQ(symfile->GetPluginName(), SymbolFileDWARF::GetPluginNameStatic());<br class="gmail_msg">
-<br class="gmail_msg">
-  uint32_t expected_abilities = SymbolFile::kAllAbilities;<br class="gmail_msg">
-  EXPECT_EQ(expected_abilities, symfile->CalculateAbilities());<br class="gmail_msg">
-}<br class="gmail_msg">
-<br class="gmail_msg">
-TEST_F(SymbolFilePDBTests, REQUIRES_DIA_SDK(TestAbilitiesForPDB)) {<br class="gmail_msg">
+TEST_F(SymbolFilePDBTests, TestAbilitiesForPDB) {<br class="gmail_msg">
   // Test that when we have PDB debug info, SymbolFilePDB is used.<br class="gmail_msg">
   FileSpec fspec(m_pdb_test_exe.c_str(), false);<br class="gmail_msg">
   ArchSpec aspec("i686-pc-windows");<br class="gmail_msg">
@@ -193,7 +167,7 @@ TEST_F(SymbolFilePDBTests, REQUIRES_DIA_<br class="gmail_msg">
   EXPECT_EQ(expected_abilities, symfile->CalculateAbilities());<br class="gmail_msg">
 }<br class="gmail_msg">
<br class="gmail_msg">
-TEST_F(SymbolFilePDBTests, REQUIRES_DIA_SDK(TestResolveSymbolContextBasename)) {<br class="gmail_msg">
+TEST_F(SymbolFilePDBTests, TestResolveSymbolContextBasename) {<br class="gmail_msg">
   // Test that attempting to call ResolveSymbolContext with only a basename<br class="gmail_msg">
   // finds all full paths<br class="gmail_msg">
   // with the same basename<br class="gmail_msg">
@@ -213,7 +187,7 @@ TEST_F(SymbolFilePDBTests, REQUIRES_DIA_<br class="gmail_msg">
   EXPECT_TRUE(ContainsCompileUnit(sc_list, header_spec));<br class="gmail_msg">
 }<br class="gmail_msg">
<br class="gmail_msg">
-TEST_F(SymbolFilePDBTests, REQUIRES_DIA_SDK(TestResolveSymbolContextFullPath)) {<br class="gmail_msg">
+TEST_F(SymbolFilePDBTests, TestResolveSymbolContextFullPath) {<br class="gmail_msg">
   // Test that attempting to call ResolveSymbolContext with a full path only<br class="gmail_msg">
   // finds the one source<br class="gmail_msg">
   // file that matches the full path.<br class="gmail_msg">
@@ -236,7 +210,7 @@ TEST_F(SymbolFilePDBTests, REQUIRES_DIA_<br class="gmail_msg">
 }<br class="gmail_msg">
<br class="gmail_msg">
 TEST_F(SymbolFilePDBTests,<br class="gmail_msg">
-       REQUIRES_DIA_SDK(TestLookupOfHeaderFileWithInlines)) {<br class="gmail_msg">
+       TestLookupOfHeaderFileWithInlines) {<br class="gmail_msg">
   // Test that when looking up a header file via ResolveSymbolContext (i.e. a<br class="gmail_msg">
   // file that was not by itself<br class="gmail_msg">
   // compiled, but only contributes to the combined code of other source files),<br class="gmail_msg">
@@ -264,8 +238,7 @@ TEST_F(SymbolFilePDBTests,<br class="gmail_msg">
   }<br class="gmail_msg">
 }<br class="gmail_msg">
<br class="gmail_msg">
-TEST_F(SymbolFilePDBTests,<br class="gmail_msg">
-       REQUIRES_DIA_SDK(TestLookupOfHeaderFileWithNoInlines)) {<br class="gmail_msg">
+TEST_F(SymbolFilePDBTests, TestLookupOfHeaderFileWithNoInlines) {<br class="gmail_msg">
   // Test that when looking up a header file via ResolveSymbolContext (i.e. a<br class="gmail_msg">
   // file that was not by itself<br class="gmail_msg">
   // compiled, but only contributes to the combined code of other source files),<br class="gmail_msg">
@@ -289,7 +262,7 @@ TEST_F(SymbolFilePDBTests,<br class="gmail_msg">
   }<br class="gmail_msg">
 }<br class="gmail_msg">
<br class="gmail_msg">
-TEST_F(SymbolFilePDBTests, REQUIRES_DIA_SDK(TestLineTablesMatchAll)) {<br class="gmail_msg">
+TEST_F(SymbolFilePDBTests, TestLineTablesMatchAll) {<br class="gmail_msg">
   // Test that when calling ResolveSymbolContext with a line number of 0, all<br class="gmail_msg">
   // line entries from<br class="gmail_msg">
   // the specified files are returned.<br class="gmail_msg">
@@ -338,7 +311,7 @@ TEST_F(SymbolFilePDBTests, REQUIRES_DIA_<br class="gmail_msg">
   VerifyLineEntry(module, sc, header2, *lt, 7, 0x401089);<br class="gmail_msg">
 }<br class="gmail_msg">
<br class="gmail_msg">
-TEST_F(SymbolFilePDBTests, REQUIRES_DIA_SDK(TestLineTablesMatchSpecific)) {<br class="gmail_msg">
+TEST_F(SymbolFilePDBTests, TestLineTablesMatchSpecific) {<br class="gmail_msg">
   // Test that when calling ResolveSymbolContext with a specific line number,<br class="gmail_msg">
   // only line entries<br class="gmail_msg">
   // which match the requested line are returned.<br class="gmail_msg">
@@ -390,7 +363,7 @@ TEST_F(SymbolFilePDBTests, REQUIRES_DIA_<br class="gmail_msg">
   VerifyLineEntry(module, sc, header1, *lt, 9, 0x401090);<br class="gmail_msg">
 }<br class="gmail_msg">
<br class="gmail_msg">
-TEST_F(SymbolFilePDBTests, REQUIRES_DIA_SDK(TestSimpleClassTypes)) {<br class="gmail_msg">
+TEST_F(SymbolFilePDBTests, TestSimpleClassTypes) {<br class="gmail_msg">
   FileSpec fspec(m_types_test_exe.c_str(), false);<br class="gmail_msg">
   ArchSpec aspec("i686-pc-windows");<br class="gmail_msg">
   lldb::ModuleSP module = std::make_shared<Module>(fspec, aspec);<br class="gmail_msg">
@@ -413,7 +386,7 @@ TEST_F(SymbolFilePDBTests, REQUIRES_DIA_<br class="gmail_msg">
             udt_type->GetByteSize());<br class="gmail_msg">
 }<br class="gmail_msg">
<br class="gmail_msg">
-TEST_F(SymbolFilePDBTests, REQUIRES_DIA_SDK(TestNestedClassTypes)) {<br class="gmail_msg">
+TEST_F(SymbolFilePDBTests, TestNestedClassTypes) {<br class="gmail_msg">
   FileSpec fspec(m_types_test_exe.c_str(), false);<br class="gmail_msg">
   ArchSpec aspec("i686-pc-windows");<br class="gmail_msg">
   lldb::ModuleSP module = std::make_shared<Module>(fspec, aspec);<br class="gmail_msg">
@@ -436,7 +409,7 @@ TEST_F(SymbolFilePDBTests, REQUIRES_DIA_<br class="gmail_msg">
             udt_type->GetByteSize());<br class="gmail_msg">
 }<br class="gmail_msg">
<br class="gmail_msg">
-TEST_F(SymbolFilePDBTests, REQUIRES_DIA_SDK(TestClassInNamespace)) {<br class="gmail_msg">
+TEST_F(SymbolFilePDBTests, TestClassInNamespace) {<br class="gmail_msg">
   FileSpec fspec(m_types_test_exe.c_str(), false);<br class="gmail_msg">
   ArchSpec aspec("i686-pc-windows");<br class="gmail_msg">
   lldb::ModuleSP module = std::make_shared<Module>(fspec, aspec);<br class="gmail_msg">
@@ -459,7 +432,7 @@ TEST_F(SymbolFilePDBTests, REQUIRES_DIA_<br class="gmail_msg">
             udt_type->GetByteSize());<br class="gmail_msg">
 }<br class="gmail_msg">
<br class="gmail_msg">
-TEST_F(SymbolFilePDBTests, REQUIRES_DIA_SDK(TestEnumTypes)) {<br class="gmail_msg">
+TEST_F(SymbolFilePDBTests, TestEnumTypes) {<br class="gmail_msg">
   FileSpec fspec(m_types_test_exe.c_str(), false);<br class="gmail_msg">
   ArchSpec aspec("i686-pc-windows");<br class="gmail_msg">
   lldb::ModuleSP module = std::make_shared<Module>(fspec, aspec);<br class="gmail_msg">
@@ -492,21 +465,21 @@ TEST_F(SymbolFilePDBTests, REQUIRES_DIA_<br class="gmail_msg">
   }<br class="gmail_msg">
 }<br class="gmail_msg">
<br class="gmail_msg">
-TEST_F(SymbolFilePDBTests, REQUIRES_DIA_SDK(TestArrayTypes)) {<br class="gmail_msg">
+TEST_F(SymbolFilePDBTests, TestArrayTypes) {<br class="gmail_msg">
   // In order to get this test working, we need to support lookup by symbol<br class="gmail_msg">
   // name.  Because array<br class="gmail_msg">
   // types themselves do not have names, only the symbols have names (i.e. the<br class="gmail_msg">
   // name of the array).<br class="gmail_msg">
 }<br class="gmail_msg">
<br class="gmail_msg">
-TEST_F(SymbolFilePDBTests, REQUIRES_DIA_SDK(TestFunctionTypes)) {<br class="gmail_msg">
+TEST_F(SymbolFilePDBTests, TestFunctionTypes) {<br class="gmail_msg">
   // In order to get this test working, we need to support lookup by symbol<br class="gmail_msg">
   // name.  Because array<br class="gmail_msg">
   // types themselves do not have names, only the symbols have names (i.e. the<br class="gmail_msg">
   // name of the array).<br class="gmail_msg">
 }<br class="gmail_msg">
<br class="gmail_msg">
-TEST_F(SymbolFilePDBTests, REQUIRES_DIA_SDK(TestTypedefs)) {<br class="gmail_msg">
+TEST_F(SymbolFilePDBTests, TestTypedefs) {<br class="gmail_msg">
   FileSpec fspec(m_types_test_exe.c_str(), false);<br class="gmail_msg">
   ArchSpec aspec("i686-pc-windows");<br class="gmail_msg">
   lldb::ModuleSP module = std::make_shared<Module>(fspec, aspec);<br class="gmail_msg">
@@ -540,7 +513,7 @@ TEST_F(SymbolFilePDBTests, REQUIRES_DIA_<br class="gmail_msg">
   }<br class="gmail_msg">
 }<br class="gmail_msg">
<br class="gmail_msg">
-TEST_F(SymbolFilePDBTests, REQUIRES_DIA_SDK(TestRegexNameMatch)) {<br class="gmail_msg">
+TEST_F(SymbolFilePDBTests, TestRegexNameMatch) {<br class="gmail_msg">
   FileSpec fspec(m_types_test_exe.c_str(), false);<br class="gmail_msg">
   ArchSpec aspec("i686-pc-windows");<br class="gmail_msg">
   lldb::ModuleSP module = std::make_shared<Module>(fspec, aspec);<br class="gmail_msg">
@@ -557,7 +530,7 @@ TEST_F(SymbolFilePDBTests, REQUIRES_DIA_<br class="gmail_msg">
   EXPECT_EQ(num_results, results.GetSize());<br class="gmail_msg">
 }<br class="gmail_msg">
<br class="gmail_msg">
-TEST_F(SymbolFilePDBTests, REQUIRES_DIA_SDK(TestMaxMatches)) {<br class="gmail_msg">
+TEST_F(SymbolFilePDBTests, TestMaxMatches) {<br class="gmail_msg">
   FileSpec fspec(m_types_test_exe.c_str(), false);<br class="gmail_msg">
   ArchSpec aspec("i686-pc-windows");<br class="gmail_msg">
   lldb::ModuleSP module = std::make_shared<Module>(fspec, aspec);<br class="gmail_msg">
@@ -584,7 +557,7 @@ TEST_F(SymbolFilePDBTests, REQUIRES_DIA_<br class="gmail_msg">
   }<br class="gmail_msg">
 }<br class="gmail_msg">
<br class="gmail_msg">
-TEST_F(SymbolFilePDBTests, REQUIRES_DIA_SDK(TestNullName)) {<br class="gmail_msg">
+TEST_F(SymbolFilePDBTests, TestNullName) {<br class="gmail_msg">
   FileSpec fspec(m_types_test_exe.c_str(), false);<br class="gmail_msg">
   ArchSpec aspec("i686-pc-windows");<br class="gmail_msg">
   lldb::ModuleSP module = std::make_shared<Module>(fspec, aspec);<br class="gmail_msg">
<br class="gmail_msg">
<br class="gmail_msg">
_______________________________________________<br class="gmail_msg">
lldb-commits mailing list<br class="gmail_msg">
<a href="mailto:lldb-commits@lists.llvm.org" class="gmail_msg" target="_blank">lldb-commits@lists.llvm.org</a><br class="gmail_msg">
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits" rel="noreferrer" class="gmail_msg" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits</a><br class="gmail_msg">
</blockquote></div>