summaryrefslogtreecommitdiffstats
path: root/ppapi/tests
diff options
context:
space:
mode:
authorglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-10 06:30:25 +0000
committerglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-10 06:30:25 +0000
commit83444f421e631ef2d174f02a6608d23fbbfbe1d4 (patch)
tree29155b492a38ed86102f264d6d948117c70dba42 /ppapi/tests
parentd4ffd59db706138a5981f54d1372c6d6cfac99b3 (diff)
downloadchromium_src-83444f421e631ef2d174f02a6608d23fbbfbe1d4.zip
chromium_src-83444f421e631ef2d174f02a6608d23fbbfbe1d4.tar.gz
chromium_src-83444f421e631ef2d174f02a6608d23fbbfbe1d4.tar.bz2
Increase the value of kViewChangeTimeoutSec under ThreadSanitizer.
This is necessary to fix OutOfProcessPPAPITest.View_PageHideShow under TSan BUG=109336,327351 R=brettw@chromium.org Review URL: https://codereview.chromium.org/155763003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250057 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/tests')
-rw-r--r--ppapi/tests/test_view.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/ppapi/tests/test_view.cc b/ppapi/tests/test_view.cc
index 29ab1a6..d141c05 100644
--- a/ppapi/tests/test_view.cc
+++ b/ppapi/tests/test_view.cc
@@ -14,7 +14,12 @@
REGISTER_TEST_CASE(View);
// When waiting for view changed events, wait no longer than this.
+#if !defined(THREAD_SANITIZER)
static int kViewChangeTimeoutSec = 5;
+#else
+// ThreadSanitizer may slow the interaction down significantly.
+static int kViewChangeTimeoutSec = 30;
+#endif
TestView::TestView(TestingInstance* instance)
: TestCase(instance),