diff options
| author | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-23 16:20:20 +0000 |
|---|---|---|
| committer | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-23 16:20:20 +0000 |
| commit | 99d884e1ea1ca0fd6402e18980b7706b433b6f44 (patch) | |
| tree | 71fd2bc291324460af9f1907aec0eaeb951d9951 /sandbox | |
| parent | 7ad4c92aa5553ff3400d277d973956a62f8d55ad (diff) | |
| download | chromium_src-99d884e1ea1ca0fd6402e18980b7706b433b6f44.zip chromium_src-99d884e1ea1ca0fd6402e18980b7706b433b6f44.tar.gz chromium_src-99d884e1ea1ca0fd6402e18980b7706b433b6f44.tar.bz2 | |
Disable UnloadAviCapDllNoPatching because it is flaky.
BUG=80569
TEST=NONE
Review URL: https://chromiumcodereview.appspot.com/10421008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138490 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox')
| -rw-r--r-- | sandbox/src/unload_dll_test.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sandbox/src/unload_dll_test.cc b/sandbox/src/unload_dll_test.cc index 62d641e..2bce1b8 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); |