[Lldb-commits] [lldb] r158812 - in /lldb/branches/apple/python-GIL: ./ source/Commands/ test/ test/functionalities/breakpoint/breakpoint_command/ test/functionalities/completion/ test/functionalities/single-quote-in-filename-to-lldb/ test/functionalities/single-quote-in-filename-to-lldb/path with '09/ test/settings/ test/terminal/ test/warnings/uuid/ tools/driver/
Filipe Cabecinhas
me at filcab.net
Wed Jun 20 03:24:26 PDT 2012
Author: filcab
Date: Wed Jun 20 05:24:26 2012
New Revision: 158812
URL: http://llvm.org/viewvc/llvm-project?rev=158812&view=rev
Log:
Merge changes from ToT trunk.
Added:
lldb/branches/apple/python-GIL/test/functionalities/single-quote-in-filename-to-lldb/
- copied from r158809, lldb/trunk/test/functionalities/single-quote-in-filename-to-lldb/
lldb/branches/apple/python-GIL/test/functionalities/single-quote-in-filename-to-lldb/Makefile
- copied unchanged from r158809, lldb/trunk/test/functionalities/single-quote-in-filename-to-lldb/Makefile
lldb/branches/apple/python-GIL/test/functionalities/single-quote-in-filename-to-lldb/TestSingleQuoteInFilename.py
- copied unchanged from r158809, lldb/trunk/test/functionalities/single-quote-in-filename-to-lldb/TestSingleQuoteInFilename.py
lldb/branches/apple/python-GIL/test/functionalities/single-quote-in-filename-to-lldb/main.c
- copied unchanged from r158809, lldb/trunk/test/functionalities/single-quote-in-filename-to-lldb/main.c
lldb/branches/apple/python-GIL/test/functionalities/single-quote-in-filename-to-lldb/path with '09/
- copied from r158809, lldb/trunk/test/functionalities/single-quote-in-filename-to-lldb/path with '09/
Modified:
lldb/branches/apple/python-GIL/ (props changed)
lldb/branches/apple/python-GIL/source/Commands/CommandObjectWatchpoint.cpp
lldb/branches/apple/python-GIL/source/Commands/CommandObjectWatchpoint.h
lldb/branches/apple/python-GIL/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py
lldb/branches/apple/python-GIL/test/functionalities/completion/TestCompletion.py
lldb/branches/apple/python-GIL/test/lldbtest.py
lldb/branches/apple/python-GIL/test/settings/TestSettings.py
lldb/branches/apple/python-GIL/test/terminal/TestSTTYBeforeAndAfter.py
lldb/branches/apple/python-GIL/test/warnings/uuid/TestUUIDMismatchWanring.py
lldb/branches/apple/python-GIL/tools/driver/Driver.cpp
Propchange: lldb/branches/apple/python-GIL/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 20 05:24:26 2012
@@ -1 +1 @@
-/lldb/trunk:156467-158327
+/lldb/trunk:156467-158809
Modified: lldb/branches/apple/python-GIL/source/Commands/CommandObjectWatchpoint.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/apple/python-GIL/source/Commands/CommandObjectWatchpoint.cpp?rev=158812&r1=158811&r2=158812&view=diff
==============================================================================
--- lldb/branches/apple/python-GIL/source/Commands/CommandObjectWatchpoint.cpp (original)
+++ lldb/branches/apple/python-GIL/source/Commands/CommandObjectWatchpoint.cpp Wed Jun 20 05:24:26 2012
@@ -101,8 +101,8 @@
// Return true if wp_ids is successfully populated with the watch ids.
// False otherwise.
-static bool
-VerifyWatchpointIDs(Args &args, std::vector<uint32_t> &wp_ids)
+bool
+CommandObjectMultiwordWatchpoint::VerifyWatchpointIDs(Args &args, std::vector<uint32_t> &wp_ids)
{
// Pre-condition: args.GetArgumentCount() > 0.
assert(args.GetArgumentCount() > 0);
@@ -306,7 +306,7 @@
{
// Particular watchpoints selected; enable them.
std::vector<uint32_t> wp_ids;
- if (!VerifyWatchpointIDs(command, wp_ids))
+ if (!CommandObjectMultiwordWatchpoint::VerifyWatchpointIDs(command, wp_ids))
{
result.AppendError("Invalid watchpoints specification.");
result.SetStatus(eReturnStatusFailed);
@@ -406,7 +406,7 @@
{
// Particular watchpoints selected; enable them.
std::vector<uint32_t> wp_ids;
- if (!VerifyWatchpointIDs(command, wp_ids))
+ if (!CommandObjectMultiwordWatchpoint::VerifyWatchpointIDs(command, wp_ids))
{
result.AppendError("Invalid watchpoints specification.");
result.SetStatus(eReturnStatusFailed);
@@ -491,7 +491,7 @@
{
// Particular watchpoints selected; disable them.
std::vector<uint32_t> wp_ids;
- if (!VerifyWatchpointIDs(command, wp_ids))
+ if (!CommandObjectMultiwordWatchpoint::VerifyWatchpointIDs(command, wp_ids))
{
result.AppendError("Invalid watchpoints specification.");
result.SetStatus(eReturnStatusFailed);
@@ -574,7 +574,7 @@
{
// Particular watchpoints selected; delete them.
std::vector<uint32_t> wp_ids;
- if (!VerifyWatchpointIDs(command, wp_ids))
+ if (!CommandObjectMultiwordWatchpoint::VerifyWatchpointIDs(command, wp_ids))
{
result.AppendError("Invalid watchpoints specification.");
result.SetStatus(eReturnStatusFailed);
@@ -715,7 +715,7 @@
{
// Particular watchpoints selected; ignore them.
std::vector<uint32_t> wp_ids;
- if (!VerifyWatchpointIDs(command, wp_ids))
+ if (!CommandObjectMultiwordWatchpoint::VerifyWatchpointIDs(command, wp_ids))
{
result.AppendError("Invalid watchpoints specification.");
result.SetStatus(eReturnStatusFailed);
@@ -872,7 +872,7 @@
{
// Particular watchpoints selected; set condition on them.
std::vector<uint32_t> wp_ids;
- if (!VerifyWatchpointIDs(command, wp_ids))
+ if (!CommandObjectMultiwordWatchpoint::VerifyWatchpointIDs(command, wp_ids))
{
result.AppendError("Invalid watchpoints specification.");
result.SetStatus(eReturnStatusFailed);
Modified: lldb/branches/apple/python-GIL/source/Commands/CommandObjectWatchpoint.h
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/apple/python-GIL/source/Commands/CommandObjectWatchpoint.h?rev=158812&r1=158811&r2=158812&view=diff
==============================================================================
--- lldb/branches/apple/python-GIL/source/Commands/CommandObjectWatchpoint.h (original)
+++ lldb/branches/apple/python-GIL/source/Commands/CommandObjectWatchpoint.h Wed Jun 20 05:24:26 2012
@@ -32,6 +32,10 @@
virtual
~CommandObjectMultiwordWatchpoint ();
+
+ static bool
+ VerifyWatchpointIDs(Args &args, std::vector<uint32_t> &wp_ids);
+
};
} // namespace lldb_private
Modified: lldb/branches/apple/python-GIL/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/apple/python-GIL/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py?rev=158812&r1=158811&r2=158812&view=diff
==============================================================================
--- lldb/branches/apple/python-GIL/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py (original)
+++ lldb/branches/apple/python-GIL/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py Wed Jun 20 05:24:26 2012
@@ -14,7 +14,8 @@
@classmethod
def classCleanup(cls):
"""Cleanup the test byproduct of breakpoint_command_sequence(self)."""
- system(["/bin/sh", "-c", "rm -f output.txt output2.txt"])
+ cls.RemoveTempFile("output.txt")
+ cls.RemoveTempFile("output2.txt")
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@dsym_test
@@ -109,10 +110,8 @@
patterns = ["Breakpoint created: [0-9]+: source regex = \"is about to return \[12\]0\", locations = 1"])
# Run the program. Remove 'output.txt' if it exists.
- if os.path.exists('output.txt'):
- os.remove('output.txt')
- if os.path.exists('output2.txt'):
- os.remove('output2.txt')
+ self.RemoveTempFile("output.txt")
+ self.RemoveTempFile("output2.txt")
self.runCmd("run", RUN_SUCCEEDED)
# Check that the file 'output.txt' exists and contains the string "lldb".
Modified: lldb/branches/apple/python-GIL/test/functionalities/completion/TestCompletion.py
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/apple/python-GIL/test/functionalities/completion/TestCompletion.py?rev=158812&r1=158811&r2=158812&view=diff
==============================================================================
--- lldb/branches/apple/python-GIL/test/functionalities/completion/TestCompletion.py (original)
+++ lldb/branches/apple/python-GIL/test/functionalities/completion/TestCompletion.py Wed Jun 20 05:24:26 2012
@@ -15,8 +15,8 @@
@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"])
+ os.remove("child_send.txt")
+ os.remove("child_read.txt")
def test_process_attach_dash_dash_con(self):
"""Test that 'process attach --con' completes to 'process attach --continue '."""
Modified: lldb/branches/apple/python-GIL/test/lldbtest.py
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/apple/python-GIL/test/lldbtest.py?rev=158812&r1=158811&r2=158812&view=diff
==============================================================================
--- lldb/branches/apple/python-GIL/test/lldbtest.py (original)
+++ lldb/branches/apple/python-GIL/test/lldbtest.py Wed Jun 20 05:24:26 2012
@@ -1222,3 +1222,8 @@
return
print child
+
+ @classmethod
+ def RemoveTempFile(cls, file):
+ if os.path.exists(file):
+ os.remove(file)
Modified: lldb/branches/apple/python-GIL/test/settings/TestSettings.py
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/apple/python-GIL/test/settings/TestSettings.py?rev=158812&r1=158811&r2=158812&view=diff
==============================================================================
--- lldb/branches/apple/python-GIL/test/settings/TestSettings.py (original)
+++ lldb/branches/apple/python-GIL/test/settings/TestSettings.py Wed Jun 20 05:24:26 2012
@@ -14,10 +14,10 @@
@classmethod
def classCleanup(cls):
"""Cleanup the test byproducts."""
- system(["/bin/sh", "-c", "rm -f output1.txt"])
- system(["/bin/sh", "-c", "rm -f output2.txt"])
- system(["/bin/sh", "-c", "rm -f stderr.txt"])
- system(["/bin/sh", "-c", "rm -f stdout.txt"])
+ cls.RemoveTempFile("output1.txt")
+ cls.RemoveTempFile("output2.txt")
+ cls.RemoveTempFile("stderr.txt")
+ cls.RemoveTempFile("stdout.txt")
def test_apropos_should_also_search_settings_description(self):
"""Test that 'apropos' command should also search descriptions for the settings variables."""
Modified: lldb/branches/apple/python-GIL/test/terminal/TestSTTYBeforeAndAfter.py
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/apple/python-GIL/test/terminal/TestSTTYBeforeAndAfter.py?rev=158812&r1=158811&r2=158812&view=diff
==============================================================================
--- lldb/branches/apple/python-GIL/test/terminal/TestSTTYBeforeAndAfter.py (original)
+++ lldb/branches/apple/python-GIL/test/terminal/TestSTTYBeforeAndAfter.py Wed Jun 20 05:24:26 2012
@@ -15,10 +15,10 @@
@classmethod
def classCleanup(cls):
"""Cleanup the test byproducts."""
- system(["/bin/sh", "-c", "rm -f child_send1.txt"])
- system(["/bin/sh", "-c", "rm -f child_read1.txt"])
- system(["/bin/sh", "-c", "rm -f child_send2.txt"])
- system(["/bin/sh", "-c", "rm -f child_read2.txt"])
+ cls.RemoveTempFile("child_send1.txt")
+ cls.RemoveTempFile("child_read1.txt")
+ cls.RemoveTempFile("child_send2.txt")
+ cls.RemoveTempFile("child_read2.txt")
def test_stty_dash_a_before_and_afetr_invoking_lldb_command(self):
"""Test that 'stty -a' displays the same output before and after running the lldb command."""
Modified: lldb/branches/apple/python-GIL/test/warnings/uuid/TestUUIDMismatchWanring.py
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/apple/python-GIL/test/warnings/uuid/TestUUIDMismatchWanring.py?rev=158812&r1=158811&r2=158812&view=diff
==============================================================================
--- lldb/branches/apple/python-GIL/test/warnings/uuid/TestUUIDMismatchWanring.py (original)
+++ lldb/branches/apple/python-GIL/test/warnings/uuid/TestUUIDMismatchWanring.py Wed Jun 20 05:24:26 2012
@@ -14,8 +14,8 @@
@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"])
+ cls.RemoveTempFile("child_send.txt")
+ cls.RemoveTempFile("child_read.txt")
def setUp(self):
TestBase.setUp(self)
Modified: lldb/branches/apple/python-GIL/tools/driver/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/apple/python-GIL/tools/driver/Driver.cpp?rev=158812&r1=158811&r2=158812&view=diff
==============================================================================
--- lldb/branches/apple/python-GIL/tools/driver/Driver.cpp (original)
+++ lldb/branches/apple/python-GIL/tools/driver/Driver.cpp Wed Jun 20 05:24:26 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);
More information about the lldb-commits
mailing list