[Lldb-commits] [lldb] r187801 - Test compatibility improvements for ICC

[Daniel Malea]

Author: dmalea
Date: Tue Aug  6 10:00:23 2013
New Revision: 187801

URL: http://llvm.org/viewvc/llvm-project?rev=187801&view=rev
Log:
Test compatibility improvements for ICC
- update TestThreadStepOut.py to work with Intel compilers
- fix typo in TestConcurrentEvents


Modified:
    lldb/trunk/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py
    lldb/trunk/test/functionalities/thread/step_out/TestThreadStepOut.py
    lldb/trunk/test/functionalities/thread/step_out/main.cpp

Modified: lldb/trunk/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py?rev=187801&r1=187800&r2=187801&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py (original)
+++ lldb/trunk/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py Tue Aug  6 10:00:23 2013
@@ -508,7 +508,7 @@ class ConcurrentEventsTestCase(TestBase)
 
             expected_signal_threads = num_delay_signal_threads + num_signal_threads
             self.assertEqual(expected_signal_threads, self.signal_count,
-                "Expected %d stops due to signal delivery, but got %d" % (expected_breakpoint_threads, self.signal_count))
+                "Expected %d stops due to signal delivery, but got %d" % (expected_signal_threads, self.signal_count))
 
             expected_watchpoint_threads = num_delay_watchpoint_threads + num_watchpoint_threads
             watchpoint_hit_count = self.thread_watchpoint.GetHitCount() if expected_watchpoint_threads > 0 else 0

Modified: lldb/trunk/test/functionalities/thread/step_out/TestThreadStepOut.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/thread/step_out/TestThreadStepOut.py?rev=187801&r1=187800&r2=187801&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/thread/step_out/TestThreadStepOut.py (original)
+++ lldb/trunk/test/functionalities/thread/step_out/TestThreadStepOut.py Tue Aug  6 10:00:23 2013
@@ -56,10 +56,10 @@ class ThreadStepOutTestCase(TestBase):
         TestBase.setUp(self)
         # Find the line number for our breakpoint.
         self.breakpoint = line_number('main.cpp', '// Set breakpoint here')
-        if "clang" in self.getCompiler():
-            self.step_out_destination = line_number('main.cpp', '// Expect to stop here after step-out (clang)')
+        if any([x in self.getCompiler() for x in ["gcc", "icpc", "icl"]]):
+            self.step_out_destination = line_number('main.cpp', '// Expect to stop here after step-out (icc and gcc)')
         else:
-            self.step_out_destination = line_number('main.cpp', '// Expect to stop here after step-out (gcc)')
+            self.step_out_destination = line_number('main.cpp', '// Expect to stop here after step-out (clang)')
 
     def step_out_single_thread_with_cmd(self):
         self.step_out_with_cmd("this-thread")

Modified: lldb/trunk/test/functionalities/thread/step_out/main.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/thread/step_out/main.cpp?rev=187801&r1=187800&r2=187801&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/thread/step_out/main.cpp (original)
+++ lldb/trunk/test/functionalities/thread/step_out/main.cpp Tue Aug  6 10:00:23 2013
@@ -43,7 +43,7 @@ thread_func (void *input)
     step_out_of_here(); // Expect to stop here after step-out (clang)
 
     // Return
-    return NULL;  // Expect to stop here after step-out (gcc)
+    return NULL;  // Expect to stop here after step-out (icc and gcc)
 }
 
 int main ()