vendor/lldb/lldb-trunk-r338150

2 files changed, 6 insertions, 1 deletions

diff --git a/packages/Python/lldbsuite/test/lang/cpp/auto/TestCPPAuto.py b/packages/Python/lldbsuite/test/lang/cpp/auto/TestCPPAuto.py
index 1fb7a5217495c..b10b4986d3789 100644
--- a/packages/Python/lldbsuite/test/lang/cpp/auto/TestCPPAuto.py
+++ b/packages/Python/lldbsuite/test/lang/cpp/auto/TestCPPAuto.py
@@ -18,7 +18,7 @@ class CPPAutoTestCase(TestBase):
     def test_with_run_command(self):
         """Test that auto types work in the expression parser"""
         self.build()
-        self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
+        self.runCmd("file " + self.getBuildArtifact("a.out"), CURRENT_EXECUTABLE_SET)
 
         line = line_number('main.cpp', '// break here')
         lldbutil.run_break_set_by_file_and_line(
diff --git a/packages/Python/lldbsuite/test/lang/cpp/auto/main.cpp b/packages/Python/lldbsuite/test/lang/cpp/auto/main.cpp
index 76fb95e0a34c1..6aee25c216087 100644
--- a/packages/Python/lldbsuite/test/lang/cpp/auto/main.cpp
+++ b/packages/Python/lldbsuite/test/lang/cpp/auto/main.cpp
@@ -12,5 +12,10 @@
 int main()
 {
   std::string helloworld("hello world");
+
+  // Ensure std::string copy constructor is present in the binary, as we will
+  // use it in an expression.
+  std::string other = helloworld;
+
   return 0; // break here
 }