Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Unified Diff: chrome/test/ui/ppapi_uitest.cc

Issue 8618002: ASAN timeout on OutOfProcessPPAPITest.Crypto (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/ui/ppapi_uitest.cc
diff --git a/chrome/test/ui/ppapi_uitest.cc b/chrome/test/ui/ppapi_uitest.cc
index e3ae18898a154e2ad4540a89acb4a9f03123585f..3458d8887dcdf62f3d9ca20d892e5bfa58648234 100644
--- a/chrome/test/ui/ppapi_uitest.cc
+++ b/chrome/test/ui/ppapi_uitest.cc
@@ -290,15 +290,16 @@ TEST_PPAPI_OUT_OF_PROCESS(URLUtil)
TEST_PPAPI_IN_PROCESS(CharSet)
TEST_PPAPI_OUT_OF_PROCESS(CharSet)
-TEST_PPAPI_IN_PROCESS(Crypto)
-#if defined(OS_POSIX)
+#if defined(ADDRESS_SANITIZER)
#define MAYBE_Crypto DISABLED_Crypto
#else
#define MAYBE_Crypto Crypto
#endif
-// http://crbug.com/104832 fails on ASAN, so this is an overly broad disable.
-// But ASAN currently doesn't have a way to disable specific tests.
-TEST_F(OutOfProcessPPAPITest, Crypto) {
+// http://crbug.com/104832 fails on ASAN.
+TEST_F(PPAPITest, MAYBE_Crypto) {
+ RunTestViaHTTP("Crypto");
+}
+TEST_F(OutOfProcessPPAPITest, MAYBE_Crypto) {
RunTest("Crypto");
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698