diff options
| author | kmadhusu@chromium.org <kmadhusu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-30 21:00:41 +0000 |
|---|---|---|
| committer | kmadhusu@chromium.org <kmadhusu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-30 21:00:41 +0000 |
| commit | ba0adf0687f075e8658b470068c9341fc56143c9 (patch) | |
| tree | 57bf1e6e90229842a78a8bc50b86d51f3109d46d | |
| parent | 8a44197cee226d29df0cb5d3eea907e92eeccc35 (diff) | |
| download | chromium_src-ba0adf0687f075e8658b470068c9341fc56143c9.zip chromium_src-ba0adf0687f075e8658b470068c9341fc56143c9.tar.gz chromium_src-ba0adf0687f075e8658b470068c9341fc56143c9.tar.bz2 | |
Disable PPAPINaClTest.FileSystem on Windows and Mac.
TBR=dmichael@chromium.org
BUG=130372
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10459032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139631 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/test/ui/ppapi_uitest.cc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/chrome/test/ui/ppapi_uitest.cc b/chrome/test/ui/ppapi_uitest.cc index 6850732..3c7fca0 100644 --- a/chrome/test/ui/ppapi_uitest.cc +++ b/chrome/test/ui/ppapi_uitest.cc @@ -810,7 +810,16 @@ TEST_PPAPI_NACL_VIA_HTTP(FileRef) TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileSystem) TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileSystem) -TEST_PPAPI_NACL_VIA_HTTP(FileSystem) + +// PPAPINaClTest.FileSystem times out consistently on Windows and Mac. +// http://crbug.com/130372 +#if defined(OS_MACOSX) || defined(OS_WIN) +#define MAYBE_FileSystem DISABLED_FileSystem +#else +#define MAYBE_FileSystem FileSystem +#endif + +TEST_PPAPI_NACL_VIA_HTTP(MAYBE_FileSystem) // Mac/Aura reach NOTIMPLEMENTED/time out. // Other systems work in-process, but flake out-of-process because of the |