Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/test/ppapi/ppapi_test.h" | 5 #include "content/test/ppapi/ppapi_test.h" |
| 6 #include "ppapi/shared_impl/test_harness_utils.h" | 6 #include "ppapi/shared_impl/test_harness_utils.h" |
| 7 | 7 |
| 8 // This file lists tests for Pepper APIs (without NaCl) against content_shell. | 8 // This file lists tests for Pepper APIs (without NaCl) against content_shell. |
| 9 // TODO(teravest): Move more tests here. http://crbug.com/371873 | 9 // TODO(teravest): Move more tests here. http://crbug.com/371873 |
| 10 | 10 |
| 11 // See chrome/test/ppapi/ppapi_browsertests.cc for Pepper testing that's | 11 // See chrome/test/ppapi/ppapi_browsertests.cc for Pepper testing that's |
| 12 // covered in browser_tests. | 12 // covered in browser_tests. |
| 13 | 13 |
| 14 namespace content { | 14 namespace content { |
| 15 namespace { | 15 namespace { |
| 16 | 16 |
| 17 // This macro finesses macro expansion to do what we want. | 17 // This macro finesses macro expansion to do what we want. |
| 18 #define STRIP_PREFIXES(test_name) ppapi::StripTestPrefixes(#test_name) | 18 #define STRIP_PREFIXES(test_name) ppapi::StripTestPrefixes(#test_name) |
| 19 | 19 |
| 20 #if defined(THREAD_SANITIZER) | |
| 21 #define DISABLE_IF_TSAN(test_name) DISABLED_##test_name | |
| 22 #else | |
| 23 #define DISABLE_IF_TSAN(test_name) test_name | |
| 24 #endif | |
| 25 | |
| 20 #define TEST_PPAPI_IN_PROCESS(test_name) \ | 26 #define TEST_PPAPI_IN_PROCESS(test_name) \ |
| 21 IN_PROC_BROWSER_TEST_F(PPAPITest, test_name) { \ | 27 IN_PROC_BROWSER_TEST_F(PPAPITest, test_name) { \ |
| 22 RunTest(STRIP_PREFIXES(test_name)); \ | 28 RunTest(STRIP_PREFIXES(test_name)); \ |
| 23 } | 29 } |
| 24 | 30 |
| 31 // OutOfProcessPPAPITest tests time out under ThreadSanitizer, | |
| 32 // see https://crbug.com/448323. | |
| 25 #define TEST_PPAPI_OUT_OF_PROCESS(test_name) \ | 33 #define TEST_PPAPI_OUT_OF_PROCESS(test_name) \ |
| 26 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, test_name) { \ | 34 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, DISABLE_IF_TSAN(test_name)) { \ |
| 27 RunTest(STRIP_PREFIXES(test_name)); \ | 35 RunTest(STRIP_PREFIXES(test_name)); \ |
| 28 } | 36 } |
| 29 | 37 |
| 30 TEST_PPAPI_IN_PROCESS(BrowserFont) | 38 TEST_PPAPI_IN_PROCESS(BrowserFont) |
| 31 // crbug.com/308949 | 39 // crbug.com/308949 |
| 32 #if defined(OS_WIN) | 40 #if defined(OS_WIN) |
| 33 #define MAYBE_OUT_BrowserFont DISABLED_BrowserFont | 41 #define MAYBE_OUT_BrowserFont DISABLED_BrowserFont |
| 34 #else | 42 #else |
| 35 #define MAYBE_OUT_BrowserFont BrowserFont | 43 #define MAYBE_OUT_BrowserFont BrowserFont |
| 36 #endif | 44 #endif |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 73 // in one plugin instance. This saves time on loading the plugin (especially | 81 // in one plugin instance. This saves time on loading the plugin (especially |
| 74 // for NaCl). Here, we actually want to destroy the Instance, to test whether | 82 // for NaCl). Here, we actually want to destroy the Instance, to test whether |
| 75 // the destructor can run ExecuteScript successfully. That's why we have two | 83 // the destructor can run ExecuteScript successfully. That's why we have two |
| 76 // separate calls to RunTest; the second one forces a navigation which | 84 // separate calls to RunTest; the second one forces a navigation which |
| 77 // destroys the instance from the prior RunTest. | 85 // destroys the instance from the prior RunTest. |
| 78 // See test_instance_deprecated.cc for more information. | 86 // See test_instance_deprecated.cc for more information. |
| 79 RunTest("Instance_SetupExecuteScriptAtInstanceShutdown"); | 87 RunTest("Instance_SetupExecuteScriptAtInstanceShutdown"); |
| 80 RunTest("Instance_ExecuteScriptAtInstanceShutdown"); | 88 RunTest("Instance_ExecuteScriptAtInstanceShutdown"); |
| 81 } | 89 } |
| 82 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, | 90 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, |
| 83 Instance_ExecuteScriptAtInstanceShutdown) { | 91 DISABLE_IF_TSAN(Instance_ExecuteScriptAtInstanceShutdown)) { |
|
raymes
2015/01/14 23:40:24
nit: can you link the bug here too?
| |
| 84 // (See the comment for the in-process version of this test above) | 92 // (See the comment for the in-process version of this test above) |
| 85 RunTest("Instance_SetupExecuteScriptAtInstanceShutdown"); | 93 RunTest("Instance_SetupExecuteScriptAtInstanceShutdown"); |
| 86 RunTest("Instance_ExecuteScriptAtInstanceShutdown"); | 94 RunTest("Instance_ExecuteScriptAtInstanceShutdown"); |
| 87 } | 95 } |
| 88 | 96 |
| 89 TEST_PPAPI_IN_PROCESS(Instance_LeakedObjectDestructors) | 97 TEST_PPAPI_IN_PROCESS(Instance_LeakedObjectDestructors) |
| 90 TEST_PPAPI_OUT_OF_PROCESS(Instance_LeakedObjectDestructors) | 98 TEST_PPAPI_OUT_OF_PROCESS(Instance_LeakedObjectDestructors) |
| 91 | 99 |
| 92 // We run and reload the RecursiveObjects test to ensure that the | 100 // We run and reload the RecursiveObjects test to ensure that the |
| 93 // InstanceObject (and others) are properly cleaned up after the first run. | 101 // InstanceObject (and others) are properly cleaned up after the first run. |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 149 TEST_PPAPI_IN_PROCESS(VarResource) | 157 TEST_PPAPI_IN_PROCESS(VarResource) |
| 150 TEST_PPAPI_OUT_OF_PROCESS(VarResource) | 158 TEST_PPAPI_OUT_OF_PROCESS(VarResource) |
| 151 | 159 |
| 152 TEST_PPAPI_OUT_OF_PROCESS(VideoDecoder) | 160 TEST_PPAPI_OUT_OF_PROCESS(VideoDecoder) |
| 153 | 161 |
| 154 TEST_PPAPI_IN_PROCESS(VideoDecoderDev) | 162 TEST_PPAPI_IN_PROCESS(VideoDecoderDev) |
| 155 TEST_PPAPI_OUT_OF_PROCESS(VideoDecoderDev) | 163 TEST_PPAPI_OUT_OF_PROCESS(VideoDecoderDev) |
| 156 | 164 |
| 157 } // namespace | 165 } // namespace |
| 158 } // namespace content | 166 } // namespace content |
| OLD | NEW |