diff options
| author | miletus@chromium.org <miletus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 20:43:58 +0000 |
|---|---|---|
| committer | miletus@chromium.org <miletus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 20:43:58 +0000 |
| commit | 32deeda42fad180c0e997b54bfcdad93bee08107 (patch) | |
| tree | f239a773e728a4a8fc9b3e81f1e895f96e01d079 /chrome/common | |
| parent | 303d1a2a3a8cad35352b268e075b03210c148d5f (diff) | |
| download | chromium_src-32deeda42fad180c0e997b54bfcdad93bee08107.zip chromium_src-32deeda42fad180c0e997b54bfcdad93bee08107.tar.gz chromium_src-32deeda42fad180c0e997b54bfcdad93bee08107.tar.bz2 | |
Fix the failed AssertionTest and CheckFalseTest for touch build
set the expected errors accordingly with touch build
BUG=
TEST=AssertionTest.* & CheckFalseTest.* pass on touch build
Review URL: http://codereview.chromium.org/7053019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86693 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/logging_chrome_uitest.cc | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/chrome/common/logging_chrome_uitest.cc b/chrome/common/logging_chrome_uitest.cc index 5d4236a..1d2f519 100644 --- a/chrome/common/logging_chrome_uitest.cc +++ b/chrome/common/logging_chrome_uitest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -74,6 +74,14 @@ TEST_F(ChromeLoggingTest, EnvironmentLogFileName) { #define EXPECTED_ASSERT_CRASHES 1 #endif +// Touch build will start an extra renderer process (the extension process) +// for the virtual keyboard. +#if defined(TOUCH_UI) +#define EXPECTED_ASSERT_ERRORS 2 +#else +#define EXPECTED_ASSERT_ERRORS 1 +#endif + #if !defined(NDEBUG) // We don't have assertions in release builds. // Tests whether we correctly fail on browser assertions during tests. class AssertionTest : public UITest { @@ -103,7 +111,7 @@ TEST_F(AssertionTest, Assertion) { expected_errors_ = 0; expected_crashes_ = 0; } else { - expected_errors_ = 1; + expected_errors_ = EXPECTED_ASSERT_ERRORS; expected_crashes_ = EXPECTED_ASSERT_CRASHES; } } @@ -138,7 +146,7 @@ TEST_F(CheckFalseTest, CheckFails) { expected_errors_ = 0; expected_crashes_ = 0; } else { - expected_errors_ = 1; + expected_errors_ = EXPECTED_ASSERT_ERRORS; expected_crashes_ = EXPECTED_ASSERT_CRASHES; } } |