[Lldb-commits] [lldb] r168452 - in /lldb/trunk/test: expression_command/call-function/TestCallStdStringFunction.py functionalities/command_script/main.cpp lang/cpp/stl/main.cpp logging/TestLogging.py

[Daniel Malea]

Author: dmalea
Date: Wed Nov 21 14:12:12 2012
New Revision: 168452

URL: http://llvm.org/viewvc/llvm-project?rev=168452&view=rev
Log:
Linux test case fixes
- missing includes in cpp test programs
- mismatched dwarf/dsym test cases
- make "com.apple.main-thread" expected string conditional on darwin platform


Modified:
    lldb/trunk/test/expression_command/call-function/TestCallStdStringFunction.py
    lldb/trunk/test/functionalities/command_script/main.cpp
    lldb/trunk/test/lang/cpp/stl/main.cpp
    lldb/trunk/test/logging/TestLogging.py

Modified: lldb/trunk/test/expression_command/call-function/TestCallStdStringFunction.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/expression_command/call-function/TestCallStdStringFunction.py?rev=168452&r1=168451&r2=168452&view=diff
==============================================================================
--- lldb/trunk/test/expression_command/call-function/TestCallStdStringFunction.py (original)
+++ lldb/trunk/test/expression_command/call-function/TestCallStdStringFunction.py Wed Nov 21 14:12:12 2012
@@ -28,7 +28,7 @@
     @dwarf_test
     def test_with_dwarf(self):
         """Test calling std::String member function."""
-        self.buildDsym()
+        self.buildDwarf()
         self.call_function()
 
     def call_function(self):

Modified: lldb/trunk/test/functionalities/command_script/main.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/command_script/main.cpp?rev=168452&r1=168451&r2=168452&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/command_script/main.cpp (original)
+++ lldb/trunk/test/functionalities/command_script/main.cpp Wed Nov 21 14:12:12 2012
@@ -8,6 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 #include <cstdlib>
+#include <cstring>
 #include <string>
 #include <fstream>
 #include <iostream>

Modified: lldb/trunk/test/lang/cpp/stl/main.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/cpp/stl/main.cpp?rev=168452&r1=168451&r2=168452&view=diff
==============================================================================
--- lldb/trunk/test/lang/cpp/stl/main.cpp (original)
+++ lldb/trunk/test/lang/cpp/stl/main.cpp Wed Nov 21 14:12:12 2012
@@ -6,6 +6,7 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+#include <cstdio>
 #include <iostream>
 #include <string>
 #include <map>

Modified: lldb/trunk/test/logging/TestLogging.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/logging/TestLogging.py?rev=168452&r1=168451&r2=168452&view=diff
==============================================================================
--- lldb/trunk/test/logging/TestLogging.py (original)
+++ lldb/trunk/test/logging/TestLogging.py Wed Nov 21 14:12:12 2012
@@ -43,26 +43,30 @@
         self.runCmd ("bp l")
 
         expected_log_lines = [
-            "com.apple.main-thread Processing command: command alias bp breakpoint\n",
-            "com.apple.main-thread HandleCommand, cmd_obj : 'command alias'\n",
-            "com.apple.main-thread HandleCommand, revised_command_line: 'command alias bp breakpoint'\n",
-            "com.apple.main-thread HandleCommand, wants_raw_input:'True'\n",
-            "com.apple.main-thread HandleCommand, command line after removing command name(s): 'bp breakpoint'\n",
-            "com.apple.main-thread HandleCommand, command succeeded\n",
-            "com.apple.main-thread Processing command: bp set -n main\n",
-            "com.apple.main-thread HandleCommand, cmd_obj : 'breakpoint set'\n",
-            "com.apple.main-thread HandleCommand, revised_command_line: 'breakpoint set -n main'\n",
-            "com.apple.main-thread HandleCommand, wants_raw_input:'False'\n",
-            "com.apple.main-thread HandleCommand, command line after removing command name(s): '-n main'\n",
-            "com.apple.main-thread HandleCommand, command succeeded\n",
-            "com.apple.main-thread Processing command: bp l\n",
-            "com.apple.main-thread HandleCommand, cmd_obj : 'breakpoint list'\n",
-            "com.apple.main-thread HandleCommand, revised_command_line: 'breakpoint l'\n",
-            "com.apple.main-thread HandleCommand, wants_raw_input:'False'\n",
-            "com.apple.main-thread HandleCommand, command line after removing command name(s): ''\n",
-            "com.apple.main-thread HandleCommand, command succeeded\n",
+            "Processing command: command alias bp breakpoint\n",
+            "HandleCommand, cmd_obj : 'command alias'\n",
+            "HandleCommand, revised_command_line: 'command alias bp breakpoint'\n",
+            "HandleCommand, wants_raw_input:'True'\n",
+            "HandleCommand, command line after removing command name(s): 'bp breakpoint'\n",
+            "HandleCommand, command succeeded\n",
+            "Processing command: bp set -n main\n",
+            "HandleCommand, cmd_obj : 'breakpoint set'\n",
+            "HandleCommand, revised_command_line: 'breakpoint set -n main'\n",
+            "HandleCommand, wants_raw_input:'False'\n",
+            "HandleCommand, command line after removing command name(s): '-n main'\n",
+            "HandleCommand, command succeeded\n",
+            "Processing command: bp l\n",
+            "HandleCommand, cmd_obj : 'breakpoint list'\n",
+            "HandleCommand, revised_command_line: 'breakpoint l'\n",
+            "HandleCommand, wants_raw_input:'False'\n",
+            "HandleCommand, command line after removing command name(s): ''\n",
+            "HandleCommand, command succeeded\n",
             ]
 
+        # com.apple.main-thread identifier appears on darwin only
+        if sys.platform.startswith("darwin"):
+            expected_log_lines = ['com.apple.main-thread ' + x for x in expected_log_lines]
+
         self.assertTrue (os.path.isfile (log_file))
 
         idx = 0