summaryrefslogtreecommitdiffstats
path: root/sandbox
diff options
context:
space:
mode:
authorzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-28 22:47:02 +0000
committerzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-28 22:47:02 +0000
commit72f5b83dc320b25e044369df07c40385e8ed468d (patch)
tree48a9093fadc91613562d73bc565b41713bfda527 /sandbox
parentb2aadd4bbef9ed9d8dfc641d34096ccf46ba7c30 (diff)
downloadchromium_src-72f5b83dc320b25e044369df07c40385e8ed468d.zip
chromium_src-72f5b83dc320b25e044369df07c40385e8ed468d.tar.gz
chromium_src-72f5b83dc320b25e044369df07c40385e8ed468d.tar.bz2
Mark UnloadDllTest.BaselineAvicapDll as flaky on windows.
BUG=80569 TBR=dmaclach@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83431 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox')
-rw-r--r--sandbox/src/unload_dll_test.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/sandbox/src/unload_dll_test.cc b/sandbox/src/unload_dll_test.cc
index a50f1aa..174ef14 100644
--- a/sandbox/src/unload_dll_test.cc
+++ b/sandbox/src/unload_dll_test.cc
@@ -40,7 +40,13 @@ SBOX_TESTS_COMMAND int SimpleOpenEvent(int argc, wchar_t **argv) {
return event_open.Get() ? SBOX_TEST_SUCCEEDED : SBOX_TEST_FAILED;
}
-TEST(UnloadDllTest, BaselineAvicapDll) {
+// Flaky on windows, see http://crbug.com/80569.
+#if defined(OS_WIN)
+#define MAYBE_BaselineAvicapDll FLAKY_BaselineAvicapDll
+#else
+#define MAYBE_BaselineAvicapDll BaselineAvicapDll
+#endif
+TEST(UnloadDllTest, MAYBE_BaselineAvicapDll) {
TestRunner runner;
runner.SetTestState(BEFORE_REVERT);
runner.SetTimeout(2000);