12 files changed, 10 insertions, 10 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/linux-core/TestLinuxCore.py b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/TestLinuxCore.py
index da6098f88f9..42542099b9f 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/linux-core/TestLinuxCore.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/TestLinuxCore.py
@@ -30,13 +30,13 @@ class LinuxCoreTestCase(TestBase):
     @skipIf(triple='^mips')
     def test_i386(self):
         """Test that lldb can read the process information from an i386 linux core file."""
-        self.do_test("i386", self._i386_pid, self._i386_regions)
+        self.do_test("linux-i386", 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("x86_64", self._x86_64_pid, self._x86_64_regions)
+        self.do_test("linux-x86_64", self._x86_64_pid, self._x86_64_regions)
 
     # This seems to hang on non-s390x platforms for some reason.  Disabling
     # for now.
@@ -44,7 +44,7 @@ class LinuxCoreTestCase(TestBase):
     @skipIf(triple='^mips')
     def test_s390x(self):
         """Test that lldb can read the process information from an s390x linux core file."""
-        self.do_test("s390x", self._s390x_pid, self._s390x_regions)
+        self.do_test("linux-s390x", self._s390x_pid, self._s390x_regions)
 
     @skipIf(oslist=['windows'])
     @skipIf(triple='^mips')
@@ -52,9 +52,9 @@ class LinuxCoreTestCase(TestBase):
         """Test that we read the information from the core correctly even if we have a running
         process with the same PID around"""
         try:
-            shutil.copyfile("x86_64.out", "x86_64-pid.out")
-            shutil.copyfile("x86_64.core", "x86_64-pid.core")
-            with open("x86_64-pid.core", "r+b") as f:
+            shutil.copyfile("linux-x86_64.out", "linux-x86_64-pid.out")
+            shutil.copyfile("linux-x86_64.core", "linux-x86_64-pid.core")
+            with open("linux-x86_64-pid.core", "r+b") as f:
                 # These are offsets into the NT_PRSTATUS and NT_PRPSINFO structures in the note
                 # segment of the core file. If you update the file, these offsets may need updating
                 # as well. (Notes can be viewed with readelf --notes.)
@@ -70,10 +70,10 @@ class LinuxCoreTestCase(TestBase):
                     # works.
                     f.seek(pid_offset)
                     f.write(struct.pack("<I", os.getpid()))
-            self.do_test("x86_64-pid", os.getpid(), self._x86_64_regions)
+            self.do_test("linux-x86_64-pid", os.getpid(), self._x86_64_regions)
         finally:
-            self.RemoveTempFile("x86_64-pid.out")
-            self.RemoveTempFile("x86_64-pid.core")
+            self.RemoveTempFile("linux-x86_64-pid.out")
+            self.RemoveTempFile("linux-x86_64-pid.core")
 
     @skipIf(oslist=['windows'])
     @skipIf(triple='^mips')
@@ -102,7 +102,7 @@ class LinuxCoreTestCase(TestBase):
 
         # without destroying this process, run the test which opens another core file with the
         # same pid
-        self.do_test("x86_64", self._x86_64_pid, self._x86_64_regions)
+        self.do_test("linux-x86_64", self._x86_64_pid, self._x86_64_regions)
 
     def check_memory_regions(self, process, region_count):
         region_list = process.GetMemoryRegions()
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/linux-core/altmain.c b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/altmain.c
index da49a00996e..da49a00996e 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/linux-core/altmain.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/altmain.c
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/linux-core/altmain.core b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/altmain.core
index 423413070c7..423413070c7 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/linux-core/altmain.core
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/altmain.core
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/linux-core/altmain.out b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/altmain.out
index 2fddf3e8f80..2fddf3e8f80 100755
--- a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/linux-core/altmain.out
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/altmain.out
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/linux-core/i386.core b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-i386.core
index f8deff474d1..f8deff474d1 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/linux-core/i386.core
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-i386.core
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/linux-core/i386.out b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-i386.out
index 3cdd4eeca10..3cdd4eeca10 100755
--- a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/linux-core/i386.out
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-i386.out
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/linux-core/s390x.core b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-s390x.core
index b97fc43e967..b97fc43e967 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/linux-core/s390x.core
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-s390x.core
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/linux-core/s390x.out b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-s390x.out
index 640fbdc257d..640fbdc257d 100755
--- a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/linux-core/s390x.out
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-s390x.out
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/linux-core/x86_64.core b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-x86_64.core
index e2fa69e4558..e2fa69e4558 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/linux-core/x86_64.core
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-x86_64.core
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/linux-core/x86_64.out b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-x86_64.out
index 842402fd519..842402fd519 100755
--- a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/linux-core/x86_64.out
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/linux-x86_64.out
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/linux-core/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/main.c
index f5bde4171ca..f5bde4171ca 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/linux-core/main.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/main.c
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/linux-core/make-core.sh b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/make-core.sh
index 9dd83f19c76..9dd83f19c76 100755
--- a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/linux-core/make-core.sh
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/make-core.sh