| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "build/build_config.h" | 5 #include "build/build_config.h" |
| 6 | 6 |
| 7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
| 8 #include <windows.h> | 8 #include <windows.h> |
| 9 #endif | 9 #endif |
| 10 | 10 |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 123 launch_arguments_.AppendSwitch(switches::kRendererCheckFalseTest); | 123 launch_arguments_.AppendSwitch(switches::kRendererCheckFalseTest); |
| 124 } | 124 } |
| 125 }; | 125 }; |
| 126 | 126 |
| 127 #if defined(OS_WIN) | 127 #if defined(OS_WIN) |
| 128 // http://crbug.com/38497 | 128 // http://crbug.com/38497 |
| 129 #define CheckFails FLAKY_CheckFails | 129 #define CheckFails FLAKY_CheckFails |
| 130 #elif defined(OS_MACOSX) | 130 #elif defined(OS_MACOSX) |
| 131 // Crash service doesn't exist for the Mac yet: http://crbug.com/45243 | 131 // Crash service doesn't exist for the Mac yet: http://crbug.com/45243 |
| 132 #define CheckFails DISABLED_CheckFails | 132 #define CheckFails DISABLED_CheckFails |
| 133 #elif defined(OS_LINUX) |
| 134 // TODO(phajdan) Fix this - http://crbug.com/49838 |
| 135 #define CheckFails FAILS_CheckFails |
| 133 #endif | 136 #endif |
| 134 // Launch the app in assertion test mode, then close the app. | 137 // Launch the app in assertion test mode, then close the app. |
| 135 TEST_F(CheckFalseTest, CheckFails) { | 138 TEST_F(CheckFalseTest, CheckFails) { |
| 136 if (UITest::in_process_renderer()) { | 139 if (UITest::in_process_renderer()) { |
| 137 // in process mode doesn't do the crashing. | 140 // in process mode doesn't do the crashing. |
| 138 expected_errors_ = 0; | 141 expected_errors_ = 0; |
| 139 expected_crashes_ = 0; | 142 expected_crashes_ = 0; |
| 140 } else { | 143 } else { |
| 141 expected_errors_ = 1; | 144 expected_errors_ = 1; |
| 142 expected_crashes_ = EXPECTED_ASSERT_CRASHES; | 145 expected_crashes_ = EXPECTED_ASSERT_CRASHES; |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 177 if (UITest::in_process_renderer()) { | 180 if (UITest::in_process_renderer()) { |
| 178 // in process mode doesn't do the crashing. | 181 // in process mode doesn't do the crashing. |
| 179 expected_crashes_ = 0; | 182 expected_crashes_ = 0; |
| 180 } else { | 183 } else { |
| 181 scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); | 184 scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); |
| 182 ASSERT_TRUE(browser.get()); | 185 ASSERT_TRUE(browser.get()); |
| 183 ASSERT_TRUE(browser->WaitForTabCountToBecome(1, action_max_timeout_ms())); | 186 ASSERT_TRUE(browser->WaitForTabCountToBecome(1, action_max_timeout_ms())); |
| 184 expected_crashes_ = EXPECTED_CRASH_CRASHES; | 187 expected_crashes_ = EXPECTED_CRASH_CRASHES; |
| 185 } | 188 } |
| 186 } | 189 } |
| OLD | NEW |