diff options
| -rw-r--r-- | chrome/test/ui/ppapi_uitest.cc | 4 | ||||
| -rw-r--r-- | ppapi/tests/test_post_message.cc | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/chrome/test/ui/ppapi_uitest.cc b/chrome/test/ui/ppapi_uitest.cc index 2adb376..0fa673ad 100644 --- a/chrome/test/ui/ppapi_uitest.cc +++ b/chrome/test/ui/ppapi_uitest.cc @@ -540,15 +540,13 @@ TEST_PPAPI_OUT_OF_PROCESS(DISABLED_PostMessage_SendingArrayBuffer) TEST_PPAPI_OUT_OF_PROCESS(PostMessage_MessageEvent) TEST_PPAPI_OUT_OF_PROCESS(PostMessage_NoHandler) TEST_PPAPI_OUT_OF_PROCESS(PostMessage_ExtraParam) -#if !defined(OS_WIN) -// Times out on Windows XP: http://crbug.com/95557 TEST_PPAPI_OUT_OF_PROCESS(PostMessage_NonMainThread) -#endif TEST_PPAPI_NACL_VIA_HTTP(PostMessage_SendInInit) TEST_PPAPI_NACL_VIA_HTTP(PostMessage_SendingData) TEST_PPAPI_NACL_VIA_HTTP(PostMessage_SendingArrayBuffer) TEST_PPAPI_NACL_VIA_HTTP(PostMessage_MessageEvent) TEST_PPAPI_NACL_VIA_HTTP(PostMessage_NoHandler) + #if defined(OS_WIN) // Flaky: http://crbug.com/111209 // diff --git a/ppapi/tests/test_post_message.cc b/ppapi/tests/test_post_message.cc index 94b47de..68fe633 100644 --- a/ppapi/tests/test_post_message.cc +++ b/ppapi/tests/test_post_message.cc @@ -29,8 +29,16 @@ const char kTestString[] = "Hello world!"; const bool kTestBool = true; const int32_t kTestInt = 42; const double kTestDouble = 42.0; + +// On Windows XP bots, the NonMainThread test can run very slowly. So we dial +// back the number of threads & messages when running on Windows. +#ifdef PPAPI_OS_WIN +const int32_t kThreadsToRun = 2; +const int32_t kMessagesToSendPerThread = 5; +#else const int32_t kThreadsToRun = 4; const int32_t kMessagesToSendPerThread = 10; +#endif // The struct that invoke_post_message_thread_func expects for its argument. // It includes the instance on which to invoke PostMessage, and the value to |