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

Unified Diff: sandbox/src/unload_dll_test.cc

Issue 10421008: Disable UnloadAviCapDllNoPatching because it is flaky. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 months 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: sandbox/src/unload_dll_test.cc
diff --git a/sandbox/src/unload_dll_test.cc b/sandbox/src/unload_dll_test.cc
index 62d641eef5aaf3b8bf75ec34a2f5ce5beadd4c6e..2bce1b874a3454f1158064d528c91a36eb17b865 100644
--- a/sandbox/src/unload_dll_test.cc
+++ b/sandbox/src/unload_dll_test.cc
@@ -41,12 +41,7 @@ SBOX_TESTS_COMMAND int SimpleOpenEvent(int argc, wchar_t **argv) {
}
// Flaky on windows, see http://crbug.com/80569.
-#if defined(OS_WIN)
-#define MAYBE_BaselineAvicapDll DISABLED_BaselineAvicapDll
-#else
-#define MAYBE_BaselineAvicapDll BaselineAvicapDll
-#endif
-TEST(UnloadDllTest, MAYBE_BaselineAvicapDll) {
+TEST(UnloadDllTest, DISABLED_BaselineAvicapDll) {
TestRunner runner;
runner.SetTestState(BEFORE_REVERT);
runner.SetTimeout(2000);
@@ -61,7 +56,8 @@ TEST(UnloadDllTest, MAYBE_BaselineAvicapDll) {
EXPECT_EQ(SBOX_TEST_SUCCEEDED, runner.RunTest(L"UseOneDLL B avicap32.dll"));
}
-TEST(UnloadDllTest, FLAKY_UnloadAviCapDllNoPatching) {
+// Flaky on windows, see http://crbug.com/80569.
+TEST(UnloadDllTest, DISABLED_UnloadAviCapDllNoPatching) {
TestRunner runner;
runner.SetTestState(BEFORE_REVERT);
runner.SetTimeout(2000);
« 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