Revert r357504, r357491, r357482 because of bot breakage.

See discussion in https://reviews.llvm.org/D60001.

Revert Clean up windows build bot.
This reverts r357504 (git commit 380c2420ecb0c3e809b04f385d37b89800df1ecf)
Revert Fix buildbot where paths were not matching up.
This reverts r357491 (git commit 5050586860140b55a0cc68c77dd1438f44a23ca5)
Revert Allow partial UUID matching in Minidump core file plug-in
This reverts r357482 (git commit 838bba9c34bf1e5500c2e100327bc764afc8d367)

llvm-svn: 357534

5 files changed, 1 insertions, 86 deletions

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/TestMiniDumpUUID.py b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/TestMiniDumpUUID.py
index d17d4bc1106..1e4a98363e3 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/TestMiniDumpUUID.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/TestMiniDumpUUID.py
@@ -8,7 +8,6 @@ from six import iteritems
 import shutil
 
 import lldb
-import os
 from lldbsuite.test.decorators import *
 from lldbsuite.test.lldbtest import *
 from lldbsuite.test import lldbutil
@@ -30,10 +29,7 @@ class MiniDumpUUIDTestCase(TestBase):
 
     def verify_module(self, module, verify_path, verify_uuid):
         uuid = module.GetUUIDString()
-        fullpath = module.GetFileSpec().fullpath
-        msg = 'Verify path ("%s") is contained in the fullpath ("%s")' % (
-                verify_path, fullpath)
-        self.assertTrue(verify_path in fullpath, msg)
+        self.assertEqual(verify_path, module.GetFileSpec().fullpath)
         self.assertEqual(verify_uuid, uuid)
 
     def test_zero_uuid_modules(self):
@@ -136,56 +132,3 @@ class MiniDumpUUIDTestCase(TestBase):
         self.assertEqual(2, len(modules))
         self.verify_module(modules[0], "/not/exist/a", None)
         self.verify_module(modules[1], "/not/exist/b", None)
-
-    @skipIf(oslist=['windows'])
-    def test_partial_uuid_match(self):
-        """
-            Breakpad has been known to create minidump files using CvRecord in each
-            module whose signature is set to PDB70 where the UUID only contains the
-            first 16 bytes of a 20 byte ELF build ID. Code was added to 
-            ProcessMinidump.cpp to deal with this and allows partial UUID matching. 
-
-            This test verifies that if we have a minidump with a 16 byte UUID, that
-            we are able to associate a symbol file with a 20 byte UUID only if the
-            first 16 bytes match. In this case we will see the path from the file
-            we found in the test directory and the 20 byte UUID from the actual
-            file, not the 16 byte shortened UUID from the minidump.
-        """
-        so_path = self.getBuildArtifact("libuuidmatch.so")
-        self.yaml2obj("libuuidmatch.yaml", so_path)
-        self.dbg.CreateTarget(None)
-        self.target = self.dbg.GetSelectedTarget()
-        cmd = 'settings set target.exec-search-paths "%s"' % (os.path.dirname(so_path))
-        self.dbg.HandleCommand(cmd)
-        self.process = self.target.LoadCore("linux-arm-partial-uuids-match.dmp")
-        modules = self.target.modules
-        self.assertEqual(1, len(modules))
-        self.verify_module(modules[0],
-                           "libuuidmatch.so", 
-                           "7295E17C-6668-9E05-CBB5-DEE5003865D5-5267C116")
-
-    @skipIf(oslist=['windows'])
-    def test_partial_uuid_mismatch(self):
-        """
-            Breakpad has been known to create minidump files using CvRecord in each
-            module whose signature is set to PDB70 where the UUID only contains the
-            first 16 bytes of a 20 byte ELF build ID. Code was added to 
-            ProcessMinidump.cpp to deal with this and allows partial UUID matching. 
-            
-            This test verifies that if we have a minidump with a 16 byte UUID, that
-            we are not able to associate a symbol file with a 20 byte UUID only if
-            any of the first 16 bytes do not match. In this case we will see the UUID
-            from the minidump file and the path from the minidump file.
-        """
-        so_path = self.getBuildArtifact("libuuidmismatch.so")
-        self.yaml2obj("libuuidmatch.yaml", so_path)
-        self.dbg.CreateTarget(None)
-        self.target = self.dbg.GetSelectedTarget()
-        cmd = 'settings set target.exec-search-paths "%s"' % (os.path.dirname(so_path))
-        self.dbg.HandleCommand(cmd)
-        self.process = self.target.LoadCore("linux-arm-partial-uuids-mismatch.dmp")
-        modules = self.target.modules
-        self.assertEqual(1, len(modules))
-        self.verify_module(modules[0],
-                           "/invalid/path/on/current/system/libuuidmismatch.so", 
-                           "7295E17C-6668-9E05-CBB5-DEE5003865D5")
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/libuuidmatch.yaml b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/libuuidmatch.yaml
deleted file mode 100644
index 3610694d4db..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/libuuidmatch.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
---- !ELF
-FileHeader:      
-  Class:           ELFCLASS32
-  Data:            ELFDATA2LSB
-  Type:            ET_DYN
-  Machine:         EM_ARM
-  Flags:           [ EF_ARM_SOFT_FLOAT, EF_ARM_EABI_VER5 ]
-Sections:        
-  - Name:            .note.gnu.build-id
-    Type:            SHT_NOTE
-    Flags:           [ SHF_ALLOC ]
-    Address:         0x0000000000000114
-    AddressAlign:    0x0000000000000004
-    Content:         040000001400000003000000474E55007295E17C66689E05CBB5DEE5003865D55267C116
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/libuuidmismatch.yaml b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/libuuidmismatch.yaml
deleted file mode 100644
index 5fef636228e..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/libuuidmismatch.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
---- !ELF
-FileHeader:      
-  Class:           ELFCLASS32
-  Data:            ELFDATA2LSB
-  Type:            ET_DYN
-  Machine:         EM_ARM
-  Flags:           [ EF_ARM_SOFT_FLOAT, EF_ARM_EABI_VER5 ]
-Sections:        
-  - Name:            .note.gnu.build-id
-    Type:            SHT_NOTE
-    Flags:           [ SHF_ALLOC ]
-    Address:         0x0000000000000114
-    AddressAlign:    0x0000000000000004
-    Content:         040000001400000003000000474E55008295E17C66689E05CBB5DEE5003865D55267C116
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/linux-arm-partial-uuids-match.dmp b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/linux-arm-partial-uuids-match.dmp
deleted file mode 100644
index 12045dacb4e..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/linux-arm-partial-uuids-match.dmp
+++ /dev/null
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/linux-arm-partial-uuids-mismatch.dmp b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/linux-arm-partial-uuids-mismatch.dmp
deleted file mode 100644
index c5c610e63b1..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/linux-arm-partial-uuids-mismatch.dmp
+++ /dev/null