diff options
| author | benwells <benwells@chromium.org> | 2015-01-26 19:14:45 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-27 03:15:27 +0000 |
| commit | 1fbb4c67fc1c3977727873f4280b66a7d2c98f15 (patch) | |
| tree | ba28a92c6655185a33c653e709198aaa4fe302ba /ppapi/tests/test_view.cc | |
| parent | ac0afb8657e49b1f792bd19d6f0acf805c28f49a (diff) | |
| download | chromium_src-1fbb4c67fc1c3977727873f4280b66a7d2c98f15.zip chromium_src-1fbb4c67fc1c3977727873f4280b66a7d2c98f15.tar.gz chromium_src-1fbb4c67fc1c3977727873f4280b66a7d2c98f15.tar.bz2 | |
Increase timeout of PPAPI*.View tests and reenable on MSAN.
BUG=450908
Review URL: https://codereview.chromium.org/869863002
Cr-Commit-Position: refs/heads/master@{#313217}
Diffstat (limited to 'ppapi/tests/test_view.cc')
| -rw-r--r-- | ppapi/tests/test_view.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ppapi/tests/test_view.cc b/ppapi/tests/test_view.cc index 5ce903a..df51199e 100644 --- a/ppapi/tests/test_view.cc +++ b/ppapi/tests/test_view.cc @@ -14,7 +14,7 @@ REGISTER_TEST_CASE(View); // When waiting for view changed events, wait no longer than this. -#if !defined(THREAD_SANITIZER) +#if !defined(THREAD_SANITIZER) && !defined(MEMORY_SANITIZER) static int kViewChangeTimeoutSec = 5; #else // ThreadSanitizer may slow the interaction down significantly. |