Index: packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/TestLinuxCore.py
===================================================================
--- packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/TestLinuxCore.py
+++ packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/TestLinuxCore.py
@@ -26,17 +26,23 @@
     _x86_64_regions = 5
     _s390x_regions = 2
 
+    _freebsd_x86_64_pid = 0
+    _freebsd_x86_64_tid = 100283
+    _freebsd_x86_64_regions = 2
+
     @skipIf(oslist=['windows'])
     @skipIf(triple='^mips')
     def test_i386(self):
         """Test that lldb can read the process information from an i386 linux core file."""
-        self.do_test("linux-i386", self._i386_pid, self._i386_regions)
+        self.do_test("linux-i386", self._i386_pid, self._i386_pid,
+          self._i386_regions)
 
     @skipIf(oslist=['windows'])
     @skipIf(triple='^mips')
     def test_x86_64(self):
         """Test that lldb can read the process information from an x86_64 linux core file."""
-        self.do_test("linux-x86_64", self._x86_64_pid, self._x86_64_regions)
+        self.do_test("linux-x86_64", self._x86_64_pid, self._x86_64_pid,
+          self._x86_64_regions)
 
     # This seems to hang on non-s390x platforms for some reason.  Disabling
     # for now.
@@ -44,11 +50,13 @@
     @skipIf(triple='^mips')
     def test_s390x(self):
         """Test that lldb can read the process information from an s390x linux core file."""
-        self.do_test("linux-s390x", self._s390x_pid, self._s390x_regions)
+        self.do_test("linux-s390x", self._s390x_pid, self._s390x_pid,
+          self._s390x_regions)
 
     def test_freebsd_x86_64(self):
         """Test that lldb can read the process information from an x86_64 FreeBSD core file."""
-        self.do_test("freebsd-x86_64", self._x86_64_pid, self._x86_64_regions)
+        self.do_test("freebsd-x86_64", self._freebsd_x86_64_pid,
+            self._freebsd_x86_64_tid, self._freebsd_x86_64_regions)
 
     @skipIf(oslist=['windows'])
     @skipIf(triple='^mips')
@@ -74,7 +82,8 @@
                     # works.
                     f.seek(pid_offset)
                     f.write(struct.pack("<I", os.getpid()))
-            self.do_test("linux-x86_64-pid", os.getpid(), self._x86_64_regions)
+            self.do_test("linux-x86_64-pid", os.getpid(), os.getpid(),
+              self._x86_64_regions)
         finally:
             self.RemoveTempFile("linux-x86_64-pid.out")
             self.RemoveTempFile("linux-x86_64-pid.core")
@@ -106,7 +115,8 @@
 
         # without destroying this process, run the test which opens another core file with the
         # same pid
-        self.do_test("linux-x86_64", self._x86_64_pid, self._x86_64_regions)
+        self.do_test("linux-x86_64", self._x86_64_pid, self._x86_64_pid,
+          self._x86_64_regions)
 
     def check_memory_regions(self, process, region_count):
         region_list = process.GetMemoryRegions()
@@ -176,7 +186,7 @@
             end_region.GetRegionBase())
         self.assertEqual(end_region.GetRegionEnd(), lldb.LLDB_INVALID_ADDRESS)
 
-    def do_test(self, filename, pid, region_count):
+    def do_test(self, filename, pid, tid, region_count):
         target = self.dbg.CreateTarget(filename + ".out")
         process = target.LoadCore(filename + ".core")
         self.assertTrue(process, PROCESS_IS_VALID)
@@ -185,7 +195,7 @@
 
         thread = process.GetSelectedThread()
         self.assertTrue(thread)
-        self.assertEqual(thread.GetThreadID(), pid)
+        self.assertEqual(thread.GetThreadID(), tid)
         backtrace = ["bar", "foo", "_start"]
         self.assertEqual(thread.GetNumFrames(), len(backtrace))
         for i in range(len(backtrace)):