diff options
| author | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-10 05:24:51 +0000 |
|---|---|---|
| committer | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-10 05:24:51 +0000 |
| commit | c2e92266bd099107f47e57b3ef741cb0bd77f81a (patch) | |
| tree | d89e06120447f464252457682e52b7fdb4cbc0e6 /chrome/browser/service | |
| parent | 62635c758fce2b22a1cf5acdc57579bb5801b2e3 (diff) | |
| download | chromium_src-c2e92266bd099107f47e57b3ef741cb0bd77f81a.zip chromium_src-c2e92266bd099107f47e57b3ef741cb0bd77f81a.tar.gz chromium_src-c2e92266bd099107f47e57b3ef741cb0bd77f81a.tar.bz2 | |
Tests are timing out, so disabling.
TBR=zea@chromium.org
BUG=75518
TEST=none
Review URL: http://codereview.chromium.org/6657029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77601 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/service')
| -rw-r--r-- | chrome/browser/service/service_process_control_browsertest.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/chrome/browser/service/service_process_control_browsertest.cc b/chrome/browser/service/service_process_control_browsertest.cc index d10d28a..673bd4c 100644 --- a/chrome/browser/service/service_process_control_browsertest.cc +++ b/chrome/browser/service/service_process_control_browsertest.cc @@ -121,9 +121,9 @@ IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, // This tests the case when a service process is launched when browser // starts but we try to launch it again in the remoting setup dialog. -// Fails on mac. http://crbug.com/75518 +// Crashes on mac. http://crbug.com/75518 #if defined(OS_MACOSX) -#define MAYBE_LaunchTwice FAILS_LaunchTwice +#define MAYBE_LaunchTwice DISABLED_LaunchTwice #else #define MAYBE_LaunchTwice LaunchTwice #endif @@ -152,9 +152,9 @@ static void DecrementUntilZero(int* count) { // Invoke multiple Launch calls in succession and ensure that all the tasks // get invoked. -// Fails on mac. http://crbug.com/75518 +// Crashes on mac. http://crbug.com/75518 #if defined(OS_MACOSX) -#define MAYBE_MultipleLaunchTasks FAILS_MultipleLaunchTasks +#define MAYBE_MultipleLaunchTasks DISABLED_MultipleLaunchTasks #else #define MAYBE_MultipleLaunchTasks MultipleLaunchTasks #endif @@ -178,9 +178,9 @@ IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, } // Make sure using the same task for success and failure tasks works. -// Fails on mac. http://crbug.com/75518 +// Crashes on mac. http://crbug.com/75518 #if defined(OS_MACOSX) -#define MAYBE_SameLaunchTask FAILS_SameLaunchTask +#define MAYBE_SameLaunchTask DISABLED_SameLaunchTask #else #define MAYBE_SameLaunchTask SameLaunchTask #endif @@ -203,9 +203,9 @@ IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, MAYBE_SameLaunchTask) { // Tests whether disconnecting from the service IPC causes the service process // to die. -// Fails on mac. http://crbug.com/75518 +// Crashes on mac. http://crbug.com/75518 #if defined(OS_MACOSX) -#define MAYBE_DieOnDisconnect FAILS_DieOnDisconnect +#define MAYBE_DieOnDisconnect DISABLED_DieOnDisconnect #else #define MAYBE_DieOnDisconnect DieOnDisconnect #endif @@ -234,9 +234,9 @@ IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, WaitForShutdown(); } -// Fails on mac. http://crbug.com/75518 +// Crashes on mac. http://crbug.com/75518 #if defined(OS_MACOSX) -#define MAYBE_CheckPid FAILS_CheckPid +#define MAYBE_CheckPid DISABLED_CheckPid #else #define MAYBE_CheckPid CheckPid #endif |