diff options
| author | mkwst@chromium.org <mkwst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-23 13:38:19 +0000 |
|---|---|---|
| committer | mkwst@chromium.org <mkwst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-23 13:38:19 +0000 |
| commit | 8271d1eec4f8af80358be7167aa613c67ff6492e (patch) | |
| tree | ef749ca3322e17fb3d2a8fdc39735c8624ffccd9 | |
| parent | 404f17450ce8fdb17ef2b727b10b7ae08b577dfd (diff) | |
| download | chromium_src-8271d1eec4f8af80358be7167aa613c67ff6492e.zip chromium_src-8271d1eec4f8af80358be7167aa613c67ff6492e.tar.gz chromium_src-8271d1eec4f8af80358be7167aa613c67ff6492e.tar.bz2 | |
Disable BasicGalleryWatch on OSX.
It's crashing under 10.7 debug: http://build.chromium.org/p/chromium.mac/builders/Mac%2010.7%20Tests%20%28dbg%29%283%29/builds/24969/steps/browser_tests/logs/BasicGalleryWatch
BUG=387691
TBR=vandebo@chromium.org
NOTRY=true
Review URL: https://codereview.chromium.org/345403007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@279100 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc b/chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc index a73e50c..5e9780a 100644 --- a/chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc +++ b/chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc @@ -186,8 +186,14 @@ class MediaGalleriesPrivateGalleryWatchApiTest : public ExtensionApiTest { DISALLOW_COPY_AND_ASSIGN(MediaGalleriesPrivateGalleryWatchApiTest); }; +// Crashing on OSX. +#if defined(OS_MACOSX) +#define MAYBE_BasicGalleryWatch DISABLED_BasicGalleryWatch +#else +#define MAYBE_BasicGalleryWatch BasicGalleryWatch +#endif IN_PROC_BROWSER_TEST_F(MediaGalleriesPrivateGalleryWatchApiTest, - BasicGalleryWatch) { + MAYBE_BasicGalleryWatch) { SetupGalleryWatches(); // Add gallery watch listener. |