diff options
| author | erikchen <erikchen@chromium.org> | 2014-09-18 14:50:23 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-18 21:52:00 +0000 |
| commit | b661397e3856d3c3dcadf46051b42e59762946a1 (patch) | |
| tree | 9a6f8ea9e1be0779551ffc384da817bb50809be3 /apps | |
| parent | ec4b3a4e4112fcc420afed5b749eb714187a50b2 (diff) | |
| download | chromium_src-b661397e3856d3c3dcadf46051b42e59762946a1.zip chromium_src-b661397e3856d3c3dcadf46051b42e59762946a1.tar.gz chromium_src-b661397e3856d3c3dcadf46051b42e59762946a1.tar.bz2 | |
mac: Disable AppShimInteractiveTest.Launch
The test is flaky.
BUG=415422
Review URL: https://codereview.chromium.org/586443002
Cr-Commit-Position: refs/heads/master@{#295566}
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_shim/app_shim_interactive_uitest_mac.mm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/app_shim/app_shim_interactive_uitest_mac.mm b/apps/app_shim/app_shim_interactive_uitest_mac.mm index f019c8e..5806225 100644 --- a/apps/app_shim/app_shim_interactive_uitest_mac.mm +++ b/apps/app_shim/app_shim_interactive_uitest_mac.mm @@ -214,7 +214,8 @@ bool HasAppShimHost(Profile* profile, const std::string& app_id) { namespace apps { // Shims require static libraries http://crbug.com/386024. -#if defined(COMPONENT_BUILD) +// This test is flaky on OSX. http://crbug.com/415422 +#if defined(COMPONENT_BUILD) || defined(OS_MACOSX) #define MAYBE_Launch DISABLED_Launch #define MAYBE_RebuildShim DISABLED_RebuildShim #else |