diff options
| -rw-r--r-- | lldb/test/hello_world/TestHelloWorld.py | 2 | ||||
| -rw-r--r-- | lldb/test/lldbtest.py | 12 |
2 files changed, 2 insertions, 12 deletions
diff --git a/lldb/test/hello_world/TestHelloWorld.py b/lldb/test/hello_world/TestHelloWorld.py index 04a8249243a..47efd9224c1 100644 --- a/lldb/test/hello_world/TestHelloWorld.py +++ b/lldb/test/hello_world/TestHelloWorld.py @@ -60,7 +60,7 @@ class HelloWorldTestCase(TestBase): #self.breakAfterLaunch(process, "main") else: # On the other hand, the following line of code are more reliable. - self.runCmd("run", setCookie=False) + self.runCmd("run") self.process = target.GetProcess() self.assertTrue(self.process, PROCESS_IS_VALID) diff --git a/lldb/test/lldbtest.py b/lldb/test/lldbtest.py index a1ab3e69e4b..29ebc5409d7 100644 --- a/lldb/test/lldbtest.py +++ b/lldb/test/lldbtest.py @@ -403,12 +403,6 @@ class TestBase(unittest2.TestCase): # The concrete subclass should override this attribute. mydir = None - # State pertaining to the inferior process, if any. - # This reflects inferior process started through the command interface with - # either the lldb "run" or "process launch" command. - # See also self.runCmd(). - runStarted = False - # Maximum allowed attempts when launching the inferior process. # Can be overridden by the LLDB_MAX_LAUNCH_COUNT environment variable. maxLaunchCount = 3; @@ -738,7 +732,7 @@ class TestBase(unittest2.TestCase): # Decide whether to dump the session info. self.dumpSessionInfo() - def runCmd(self, cmd, msg=None, check=True, trace=False, setCookie=True): + def runCmd(self, cmd, msg=None, check=True, trace=False): """ Ask the command interpreter to handle the command and then check its return status. @@ -772,10 +766,6 @@ class TestBase(unittest2.TestCase): with recording(self, True) as sbuf: print >> sbuf, "Command '" + cmd + "' failed!" - # Modify runStarted only if "run" or "process launch" was encountered. - if running: - self.runStarted = running and setCookie - if check: self.assertTrue(self.res.Succeeded(), msg if msg else CMD_MSG(cmd)) |
