[Lldb-commits] [lldb] r158693 - in /lldb/trunk: test/functionalities/single-quote-in-filename-to-lldb/ test/functionalities/single-quote-in-filename-to-lldb/Makefile test/functionalities/single-quote-in-filename-to-lldb/TestSingleQuoteInFilename.py test/functionalities/single-quote-in-filename-to-lldb/main.c test/functionalities/single-quote-in-filename-to-lldb/path with '09/ tools/driver/Driver.cpp

[Johnny Chen]

Author: johnny
Date: Mon Jun 18 19:56:55 2012
New Revision: 158693

URL: http://llvm.org/viewvc/llvm-project?rev=158693&view=rev
Log:
rdar://problem/11649610
lldb confused by single quote in executable path

Also add a test case.

Added:
    lldb/trunk/test/functionalities/single-quote-in-filename-to-lldb/
    lldb/trunk/test/functionalities/single-quote-in-filename-to-lldb/Makefile
    lldb/trunk/test/functionalities/single-quote-in-filename-to-lldb/TestSingleQuoteInFilename.py
    lldb/trunk/test/functionalities/single-quote-in-filename-to-lldb/main.c
    lldb/trunk/test/functionalities/single-quote-in-filename-to-lldb/path with '09/
Modified:
    lldb/trunk/tools/driver/Driver.cpp

Added: lldb/trunk/test/functionalities/single-quote-in-filename-to-lldb/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/single-quote-in-filename-to-lldb/Makefile?rev=158693&view=auto
==============================================================================
--- lldb/trunk/test/functionalities/single-quote-in-filename-to-lldb/Makefile (added)
+++ lldb/trunk/test/functionalities/single-quote-in-filename-to-lldb/Makefile Mon Jun 18 19:56:55 2012
@@ -0,0 +1,5 @@
+LEVEL = ../../make
+
+C_SOURCES := main.c
+
+include $(LEVEL)/Makefile.rules

Added: lldb/trunk/test/functionalities/single-quote-in-filename-to-lldb/TestSingleQuoteInFilename.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/single-quote-in-filename-to-lldb/TestSingleQuoteInFilename.py?rev=158693&view=auto
==============================================================================
--- lldb/trunk/test/functionalities/single-quote-in-filename-to-lldb/TestSingleQuoteInFilename.py (added)
+++ lldb/trunk/test/functionalities/single-quote-in-filename-to-lldb/TestSingleQuoteInFilename.py Mon Jun 18 19:56:55 2012
@@ -0,0 +1,70 @@
+"""
+Test the lldb command line takes a filename with single quote chars.
+"""
+
+import os
+import unittest2
+import lldb
+import pexpect
+from lldbtest import *
+
+class SingleQuoteInCommandLineTestCase(TestBase):
+
+    mydir = os.path.join("functionalities", "single-quote-in-filename-to-lldb")
+    myexe = "path with '09/a.out"
+
+    @classmethod
+    def classCleanup(cls):
+        """Cleanup the test byproducts."""
+        system(["/bin/sh", "-c", "rm -f child_send.txt"])
+        system(["/bin/sh", "-c", "rm -f child_read.txt"])
+        system(["/bin/sh", "-c", "rm -f \"%s\"" % cls.myexe])
+
+    def test_lldb_invocation_with_single_quote_in_filename(self):
+        """Test that 'lldb my_file_name' works where my_file_name is a string with a single quote char in it."""
+        self.buildDefault()
+        system(["/bin/sh", "-c", "cp a.out \"%s\"" % self.myexe])
+
+        # The default lldb prompt.
+        prompt = "(lldb) "
+
+        # So that the child gets torn down after the test.
+        self.child = pexpect.spawn('%s %s "%s"' % (self.lldbHere, self.lldbOption, self.myexe))
+        child = self.child
+        child.setecho(True)
+        # Turn on logging for input/output to/from the child.
+        with open('child_send.txt', 'w') as f_send:
+            with open('child_read.txt', 'w') as f_read:
+                child.logfile_send = f_send
+                child.logfile_read = f_read
+
+                child.expect_exact(prompt)
+
+                child.send("help watchpoint")
+                child.sendline('')
+                child.expect_exact(prompt)
+
+        # Now that the necessary logging is done, restore logfile to None to
+        # stop further logging.
+        child.logfile_send = None
+        child.logfile_read = None
+        
+        with open('child_send.txt', 'r') as fs:
+            if self.TraceOn():
+                print "\n\nContents of child_send.txt:"
+                print fs.read()
+        with open('child_read.txt', 'r') as fr:
+            from_child = fr.read()
+            if self.TraceOn():
+                print "\n\nContents of child_read.txt:"
+                print from_child
+
+            self.expect(from_child, exe=False,
+                substrs = ["Current executable set to"])
+
+
+if __name__ == '__main__':
+    import atexit
+    lldb.SBDebugger.Initialize()
+    atexit.register(lambda: lldb.SBDebugger.Terminate())
+    unittest2.main()

Added: lldb/trunk/test/functionalities/single-quote-in-filename-to-lldb/main.c
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/single-quote-in-filename-to-lldb/main.c?rev=158693&view=auto
==============================================================================
--- lldb/trunk/test/functionalities/single-quote-in-filename-to-lldb/main.c (added)
+++ lldb/trunk/test/functionalities/single-quote-in-filename-to-lldb/main.c Mon Jun 18 19:56:55 2012
@@ -0,0 +1,7 @@
+#include <stdio.h>
+
+int main(int argc, const char *argv[])
+{
+    printf("Hello, world!\n");
+    return 0;
+}

Modified: lldb/trunk/tools/driver/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/driver/Driver.cpp?rev=158693&r1=158692&r2=158693&view=diff
==============================================================================
--- lldb/trunk/tools/driver/Driver.cpp (original)
+++ lldb/trunk/tools/driver/Driver.cpp Mon Jun 18 19:56:55 2012
@@ -1317,13 +1317,13 @@
                 if (m_debugger.GetDefaultArchitecture (arch_name, sizeof (arch_name)))
                     ::snprintf (command_string, 
                                 sizeof (command_string), 
-                                "target create --arch=%s '%s'", 
+                                "target create --arch=%s \"%s\"", 
                                 arch_name,
                                 m_option_data.m_args[0].c_str());
                 else
                     ::snprintf (command_string, 
                                 sizeof(command_string), 
-                                "target create '%s'", 
+                                "target create \"%s\"", 
                                 m_option_data.m_args[0].c_str());
 
                 m_debugger.HandleCommand (command_string);