summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--base/message_loop_unittest.cc5
-rw-r--r--tools/valgrind/memcheck/suppressions.txt2
2 files changed, 2 insertions, 5 deletions
diff --git a/base/message_loop_unittest.cc b/base/message_loop_unittest.cc
index ea04324..6208e99 100644
--- a/base/message_loop_unittest.cc
+++ b/base/message_loop_unittest.cc
@@ -1555,12 +1555,9 @@ class QuitDelegate : public base::MessagePumpLibevent::Watcher {
}
};
-TEST(MessageLoopTest, DISABLED_FileDescriptorWatcherOutlivesMessageLoop) {
+TEST(MessageLoopTest, FileDescriptorWatcherOutlivesMessageLoop) {
// Simulate a MessageLoop that dies before an FileDescriptorWatcher.
// This could happen when people use the Singleton pattern or atexit.
- // This is disabled for now because it fails (valgrind shows
- // invalid reads), and it's not clear any code relies on this...
- // TODO(dkegel): enable if it turns out we rely on this
// Create a file descriptor. Doesn't need to be readable or writable,
// as we don't need to actually get any notifications.
diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt
index 9c2af93..22be3ae 100644
--- a/tools/valgrind/memcheck/suppressions.txt
+++ b/tools/valgrind/memcheck/suppressions.txt
@@ -2969,7 +2969,7 @@
Memcheck:Addr4
fun:event_del
...
- fun:_ZN61MessageLoopTest_FileDescriptorWatcherOutlivesMessageLoop_Test8TestBodyEv
+ fun:*FileDescriptorWatcherOutlivesMessageLoop_Test8TestBodyEv
}
{