diff options
4 files changed, 84 insertions, 2 deletions
diff --git a/lldb/test/functionalities/single-quote-in-filename-to-lldb/Makefile b/lldb/test/functionalities/single-quote-in-filename-to-lldb/Makefile new file mode 100644 index 00000000000..0d70f259501 --- /dev/null +++ b/lldb/test/functionalities/single-quote-in-filename-to-lldb/Makefile @@ -0,0 +1,5 @@ +LEVEL = ../../make + +C_SOURCES := main.c + +include $(LEVEL)/Makefile.rules diff --git a/lldb/test/functionalities/single-quote-in-filename-to-lldb/TestSingleQuoteInFilename.py b/lldb/test/functionalities/single-quote-in-filename-to-lldb/TestSingleQuoteInFilename.py new file mode 100644 index 00000000000..65eec4cd600 --- /dev/null +++ b/lldb/test/functionalities/single-quote-in-filename-to-lldb/TestSingleQuoteInFilename.py @@ -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() diff --git a/lldb/test/functionalities/single-quote-in-filename-to-lldb/main.c b/lldb/test/functionalities/single-quote-in-filename-to-lldb/main.c new file mode 100644 index 00000000000..7cee7306547 --- /dev/null +++ b/lldb/test/functionalities/single-quote-in-filename-to-lldb/main.c @@ -0,0 +1,7 @@ +#include <stdio.h> + +int main(int argc, const char *argv[]) +{ + printf("Hello, world!\n"); + return 0; +} diff --git a/lldb/tools/driver/Driver.cpp b/lldb/tools/driver/Driver.cpp index 808035f9a96..aa21db98334 100644 --- a/lldb/tools/driver/Driver.cpp +++ b/lldb/tools/driver/Driver.cpp @@ -1317,13 +1317,13 @@ Driver::MainLoop () 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); |
