diff options
| author | phoglund <phoglund@chromium.org> | 2015-06-17 01:38:47 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-17 08:39:23 +0000 |
| commit | 92a2ffbb075e6d10b2854eb7ca0526705e39995c (patch) | |
| tree | 341089ce2cd335651dbd85b412598531b7ed2538 /chrome/test/ppapi | |
| parent | 673904b45492152cc13de1a5baa604fc74c80d0a (diff) | |
| download | chromium_src-92a2ffbb075e6d10b2854eb7ca0526705e39995c.zip chromium_src-92a2ffbb075e6d10b2854eb7ca0526705e39995c.tar.gz chromium_src-92a2ffbb075e6d10b2854eb7ca0526705e39995c.tar.bz2 | |
Disabling flaky PPAPI NetworkProxy test on Mac ASAN.
BUG=501207
TBR=bbudge@chromium.org
Review URL: https://codereview.chromium.org/1186843006
Cr-Commit-Position: refs/heads/master@{#334789}
Diffstat (limited to 'chrome/test/ppapi')
| -rw-r--r-- | chrome/test/ppapi/ppapi_browsertest.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/test/ppapi/ppapi_browsertest.cc b/chrome/test/ppapi/ppapi_browsertest.cc index 3e0bf1b..9225f0f 100644 --- a/chrome/test/ppapi/ppapi_browsertest.cc +++ b/chrome/test/ppapi/ppapi_browsertest.cc @@ -1278,7 +1278,13 @@ TEST_PPAPI_NACL(MediaStreamVideoTrack) TEST_PPAPI_NACL(MouseCursor) -TEST_PPAPI_NACL(NetworkProxy) +// Flaky on Mac ASAN (possiby elsewhere too): http://crbug.com/501207. +#if defined(OS_MACOSX) && defined(ADDRESS_SANITIZER) +#define MAYBE_NetworkProxy DISABLED_NetworkProxy +#else +#define MAYBE_NetworkProxy NetworkProxy +#endif +TEST_PPAPI_NACL(MAYBE_NetworkProxy) TEST_PPAPI_NACL(TrueTypeFont) |