diff options
Diffstat (limited to 'test')
3 files changed, 5 insertions, 5 deletions
diff --git a/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py b/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py index 6819ebe6a..5594d1ecb 100644 --- a/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py +++ b/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py @@ -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 diff --git a/test/functionalities/thread/step_out/TestThreadStepOut.py b/test/functionalities/thread/step_out/TestThreadStepOut.py index 436a03abc..be894fdee 100644 --- a/test/functionalities/thread/step_out/TestThreadStepOut.py +++ b/test/functionalities/thread/step_out/TestThreadStepOut.py @@ -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") diff --git a/test/functionalities/thread/step_out/main.cpp b/test/functionalities/thread/step_out/main.cpp index f6a973290..eb390d5de 100644 --- a/test/functionalities/thread/step_out/main.cpp +++ b/test/functionalities/thread/step_out/main.cpp @@ -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 () |