Test compatibility improvements for ICC
- update TestThreadStepOut.py to work with Intel compilers
- fix typo in TestConcurrentEvents
git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@187801 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py b/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py
index 6819ebe..5594d1e 100644
--- a/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py
+++ b/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py
@@ -508,7 +508,7 @@
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
diff --git a/test/functionalities/thread/step_out/TestThreadStepOut.py b/test/functionalities/thread/step_out/TestThreadStepOut.py
index 436a03a..be894fd 100644
--- a/test/functionalities/thread/step_out/TestThreadStepOut.py
+++ b/test/functionalities/thread/step_out/TestThreadStepOut.py
@@ -56,10 +56,10 @@
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")
diff --git a/test/functionalities/thread/step_out/main.cpp b/test/functionalities/thread/step_out/main.cpp
index f6a9732..eb390d5 100644
--- a/test/functionalities/thread/step_out/main.cpp
+++ b/test/functionalities/thread/step_out/main.cpp
@@ -43,7 +43,7 @@
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 ()