diff options
| author | sbc@chromium.org <sbc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-11 20:21:05 +0000 |
|---|---|---|
| committer | sbc@chromium.org <sbc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-11 20:21:05 +0000 |
| commit | a88b225c35c5b599efec5d2d742054ecdd1ff278 (patch) | |
| tree | a1a0533e30ca3c6d1471558505d0992445bcba1c | |
| parent | 4c558eb6d25ed875829c22e9d259ab0c1eb96289 (diff) | |
| download | chromium_src-a88b225c35c5b599efec5d2d742054ecdd1ff278.zip chromium_src-a88b225c35c5b599efec5d2d742054ecdd1ff278.tar.gz chromium_src-a88b225c35c5b599efec5d2d742054ecdd1ff278.tar.bz2 | |
Disable FilePathWatcherTest.DestroyWithPendingNotification on ARM linux.
This test is generating intermittent "signal 11 SEGV_MAPERR 0000000000dc" on exit.
BUG=259398,85930
Review URL: https://chromiumcodereview.appspot.com/18507005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211199 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | base/files/file_path_watcher_browsertest.cc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/base/files/file_path_watcher_browsertest.cc b/base/files/file_path_watcher_browsertest.cc index a0b4319..7820182 100644 --- a/base/files/file_path_watcher_browsertest.cc +++ b/base/files/file_path_watcher_browsertest.cc @@ -320,14 +320,8 @@ TEST_F(FilePathWatcherTest, DeleteDuringNotify) { // Verify that deleting the watcher works even if there is a pending // notification. -// Flaky on MacOS. http://crbug.com/85930 -#if defined(OS_MACOSX) -#define MAYBE_DestroyWithPendingNotification \ - DISABLED_DestroyWithPendingNotification -#else -#define MAYBE_DestroyWithPendingNotification DestroyWithPendingNotification -#endif -TEST_F(FilePathWatcherTest, MAYBE_DestroyWithPendingNotification) { +// Flaky on MacOS (and ARM linux): http://crbug.com/85930 +TEST_F(FilePathWatcherTest, DISABLED_DestroyWithPendingNotification) { scoped_ptr<TestDelegate> delegate(new TestDelegate(collector())); FilePathWatcher* watcher = new FilePathWatcher; ASSERT_TRUE(SetupWatch(test_file(), watcher, delegate.get(), false)); |