diff options
| author | Ilia K <ki.stfu@gmail.com> | 2015-05-07 07:16:06 +0000 | 
|---|---|---|
| committer | Ilia K <ki.stfu@gmail.com> | 2015-05-07 07:16:06 +0000 | 
| commit | 065397be002feeff1662aeaa23e23d2a98dc739c (patch) | |
| tree | f4ebcead8fcf6b1af88e09496cfcdc1baa512683 | |
| parent | d3da77e84ef9d90793e0bf5a748f79b79728506d (diff) | |
| download | bcm5719-llvm-065397be002feeff1662aeaa23e23d2a98dc739c.tar.gz bcm5719-llvm-065397be002feeff1662aeaa23e23d2a98dc739c.zip | |
Minor changes in the MiStartupOptionsTestCase (MI)
llvm-svn: 236704
| -rw-r--r-- | lldb/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py | 12 | ||||
| -rw-r--r-- | lldb/test/tools/lldb-mi/startup_options/main.cpp | 2 | 
2 files changed, 7 insertions, 7 deletions
| diff --git a/lldb/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py b/lldb/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py index 088fea7f0e4..3cba6875e73 100644 --- a/lldb/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py +++ b/lldb/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py @@ -49,7 +49,7 @@ class MiStartupOptionsTestCase(lldbmi_testcase.MiTestCaseBase):          # Test that the executable isn't loaded when unknown file was specified          self.expect("-file-exec-and-symbols \"%s\"" % path) -        self.expect("\^error,msg=\"Command 'file-exec-and-symbols'\. Target binary '%s' is invalid\. error: unable to find executable for '%s'\"" % (path, path)) +        self.expect("\^error,msg=\"Command 'file-exec-and-symbols'. Target binary '%s' is invalid. error: unable to find executable for '%s'\"" % (path, path))          # Test that lldb-mi is ready when executable was loaded          self.expect(self.child_prompt, exactly = True) @@ -123,7 +123,7 @@ class MiStartupOptionsTestCase(lldbmi_testcase.MiTestCaseBase):          # Test that the executable isn't loaded when file was specified using unknown path          self.expect("-file-exec-and-symbols \"%s\"" % path) -        self.expect("\^error,msg=\"Command 'file-exec-and-symbols'\. Target binary '%s' is invalid\. error: unable to find executable for '%s'\"" % (path, path)) +        self.expect("\^error,msg=\"Command 'file-exec-and-symbols'. Target binary '%s' is invalid. error: unable to find executable for '%s'\"" % (path, path))          # Test that lldb-mi is ready when executable was loaded          self.expect(self.child_prompt, exactly = True) @@ -151,7 +151,7 @@ class MiStartupOptionsTestCase(lldbmi_testcase.MiTestCaseBase):          self.expect("\^running")          # After '-break-insert main.cpp:BP_return' -        line = line_number('main.cpp', '// BP_return') +        line = line_number('main.cpp', '//BP_return')          self.expect("-break-insert main.cpp:%d" % line)          self.expect("\^done,bkpt={number=\"2\"") @@ -190,7 +190,7 @@ class MiStartupOptionsTestCase(lldbmi_testcase.MiTestCaseBase):          self.expect("\^running")          # After '-break-insert main.cpp:BP_return' -        line = line_number('main.cpp', '// BP_return') +        line = line_number('main.cpp', '//BP_return')          self.expect("-break-insert main.cpp:%d" % line)          self.expect("\^done,bkpt={number=\"2\"") @@ -226,7 +226,7 @@ class MiStartupOptionsTestCase(lldbmi_testcase.MiTestCaseBase):          # Test that lldb-mi is ready after execution of --source start_script          self.expect(self.child_prompt, exactly = True) -     +      @lldbmi_test      @expectedFailureWindows("llvm.org/pr22274: need a pexpect replacement for windows")      @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races @@ -299,6 +299,6 @@ class MiStartupOptionsTestCase(lldbmi_testcase.MiTestCaseBase):          # Delete log          for f in logFile:              os.remove(f) -        +  if __name__ == '__main__':      unittest2.main() diff --git a/lldb/test/tools/lldb-mi/startup_options/main.cpp b/lldb/test/tools/lldb-mi/startup_options/main.cpp index 8b9e2d0b34b..7f2d5246faf 100644 --- a/lldb/test/tools/lldb-mi/startup_options/main.cpp +++ b/lldb/test/tools/lldb-mi/startup_options/main.cpp @@ -11,5 +11,5 @@ int  main(int argc, char const *argv[])  {      int a = 10; -    return 0; // BP_return +    return 0; //BP_return  } | 

