diff options
Diffstat (limited to 'base/trace_event_win_unittest.cc')
| -rw-r--r-- | base/trace_event_win_unittest.cc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/base/trace_event_win_unittest.cc b/base/trace_event_win_unittest.cc index 1335bed..a142af1 100644 --- a/base/trace_event_win_unittest.cc +++ b/base/trace_event_win_unittest.cc @@ -79,13 +79,6 @@ class TraceEventTest: public testing::Test { void SetUp() { bool is_xp = base::win::GetVersion() < base::win::VERSION_VISTA; - if (is_xp) { - // Tear down any dangling session from an earlier failing test. - EtwTraceProperties ignore; - - EtwTraceController::Stop(kTestSessionName, &ignore); - } - // Resurrect and initialize the TraceLog singleton instance. // On Vista and better, we need the provider registered before we // start the private, in-proc session, but on XP we need the global @@ -261,7 +254,8 @@ TEST_F(TraceEventTest, TraceLog) { PlayLog(); } -TEST_F(TraceEventTest, Macros) { +// Marked flaky per http://crbug.com/52388 +TEST_F(TraceEventTest, FLAKY_Macros) { ExpectPlayLog(); // The events should arrive in the same sequence as the expects. |