9 files changed, 14 insertions, 4 deletions
diff --git a/lldb/test/functionalities/object-file/TestImageListMultiArchitecture.py b/lldb/test/functionalities/object-file/TestImageListMultiArchitecture.py
index 23a9f2bbec2..fb7a1c21d68 100644
--- a/lldb/test/functionalities/object-file/TestImageListMultiArchitecture.py
+++ b/lldb/test/functionalities/object-file/TestImageListMultiArchitecture.py
@@ -4,7 +4,6 @@ This exercises classes like ObjectFileELF and their support for opening
 foreign-architecture object files.
 """
 
-# import os
 import os.path
 import unittest2
 import lldb
@@ -23,12 +22,15 @@ class TestImageListMultiArchitecture(TestBase):
     def test_image_list_shows_multiple_architectures(self):
         """Test that image list properly shows the correct architecture for a set of different architecture object files."""
         images = {
-            "ls-freebsd-10.0-x86_64": re.compile(r"x86_64-(unknown)?-freebsd10.0 x86_64"),
-            "sleep-ubuntu-14.04-x86_64": re.compile(r"x86_64-(unknown)?-linux x86_64"),
+            "hello-freebsd-10.0-x86_64-clang-3.3": re.compile(r"x86_64-(unknown)?-freebsd10.0 x86_64"),
+            "hello-freebsd-10.0-x86_64-gcc-4.7.3": re.compile(r"x86_64-(unknown)?-freebsd10.0 x86_64"),
+            "hello-netbsd-6.1-x86_64-gcc-4.5.3": re.compile(r"x86_64-(unknown)?-netbsd x86_64"),
+            "hello-ubuntu-14.04-x86_64-gcc-4.8.2": re.compile(r"x86_64-(unknown)?-linux x86_64"),
+            "hello-ubuntu-14.04-x86_64-clang-3.5pre": re.compile(r"x86_64-(unknown)?-linux x86_64"),
         }
 
         for image_name in images:
-            file_name = os.path.abspath(os.path.join(os.path.dirname(__file__), image_name))
+            file_name = os.path.abspath(os.path.join(os.path.dirname(__file__), "bin", image_name))
             expected_triple_and_arch_regex = images[image_name]
 
             self.runCmd("file {}".format(file_name))
diff --git a/lldb/test/functionalities/object-file/bin/hello-freebsd-10.0-x86_64-clang-3.3 b/lldb/test/functionalities/object-file/bin/hello-freebsd-10.0-x86_64-clang-3.3
new file mode 100755
index 00000000000..cea323639b4
--- /dev/null
+++ b/lldb/test/functionalities/object-file/bin/hello-freebsd-10.0-x86_64-clang-3.3
diff --git a/lldb/test/functionalities/object-file/bin/hello-freebsd-10.0-x86_64-gcc-4.7.3 b/lldb/test/functionalities/object-file/bin/hello-freebsd-10.0-x86_64-gcc-4.7.3
new file mode 100755
index 00000000000..38f43f8acb9
--- /dev/null
+++ b/lldb/test/functionalities/object-file/bin/hello-freebsd-10.0-x86_64-gcc-4.7.3
diff --git a/lldb/test/functionalities/object-file/bin/hello-netbsd-6.1-x86_64-gcc-4.5.3 b/lldb/test/functionalities/object-file/bin/hello-netbsd-6.1-x86_64-gcc-4.5.3
new file mode 100755
index 00000000000..6d531320ae9
--- /dev/null
+++ b/lldb/test/functionalities/object-file/bin/hello-netbsd-6.1-x86_64-gcc-4.5.3
diff --git a/lldb/test/functionalities/object-file/bin/hello-ubuntu-14.04-x86_64-clang-3.5pre b/lldb/test/functionalities/object-file/bin/hello-ubuntu-14.04-x86_64-clang-3.5pre
new file mode 100755
index 00000000000..8bdcf4d5b59
--- /dev/null
+++ b/lldb/test/functionalities/object-file/bin/hello-ubuntu-14.04-x86_64-clang-3.5pre
diff --git a/lldb/test/functionalities/object-file/bin/hello-ubuntu-14.04-x86_64-gcc-4.8.2 b/lldb/test/functionalities/object-file/bin/hello-ubuntu-14.04-x86_64-gcc-4.8.2
new file mode 100755
index 00000000000..01efbb061b7
--- /dev/null
+++ b/lldb/test/functionalities/object-file/bin/hello-ubuntu-14.04-x86_64-gcc-4.8.2
diff --git a/lldb/test/functionalities/object-file/bin/hello.cpp b/lldb/test/functionalities/object-file/bin/hello.cpp
new file mode 100644
index 00000000000..8c804005afe
--- /dev/null
+++ b/lldb/test/functionalities/object-file/bin/hello.cpp
@@ -0,0 +1,8 @@
+#include <stdio.h>
+
+int main(int argc, char **argv)
+{
+	printf("Hello, world\n");
+	return 0;
+}
+
diff --git a/lldb/test/functionalities/object-file/ls-freebsd-10.0-x86_64 b/lldb/test/functionalities/object-file/ls-freebsd-10.0-x86_64
deleted file mode 100755
index 81605fc9907..00000000000
--- a/lldb/test/functionalities/object-file/ls-freebsd-10.0-x86_64
+++ /dev/null
diff --git a/lldb/test/functionalities/object-file/sleep-ubuntu-14.04-x86_64 b/lldb/test/functionalities/object-file/sleep-ubuntu-14.04-x86_64
deleted file mode 100755
index bdfa0f55ea0..00000000000
--- a/lldb/test/functionalities/object-file/sleep-ubuntu-14.04-x86_64
+++ /dev/null