Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(179)

Side by Side Diff: chrome/test/base/tracing_browsertest.cc

Issue 2059133002: Disable SingleProcessTracingBrowserTest.TestMemoryInfra on Linux. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/test/base/tracing.h" 5 #include "chrome/test/base/tracing.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "base/single_thread_task_runner.h" 10 #include "base/single_thread_task_runner.h"
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 ASSERT_TRUE(EndTracing(&json_events)); 163 ASSERT_TRUE(EndTracing(&json_events));
164 } 164 }
165 165
166 // Multi-process mode. 166 // Multi-process mode.
167 IN_PROC_BROWSER_TEST_F(TracingBrowserTest, TestMemoryInfra) { 167 IN_PROC_BROWSER_TEST_F(TracingBrowserTest, TestMemoryInfra) {
168 PerformDumpMemoryTestActions(); 168 PerformDumpMemoryTestActions();
169 } 169 }
170 170
171 // Single-process mode. 171 // Single-process mode.
172 // Linux ASan: https://crbug.com/585026. 172 // Linux ASan: https://crbug.com/585026.
173 #if defined(ADDRESS_SANITIZER) 173 // Linux https://crbug/619515.
174 #if defined(ADDRESS_SANITIZER) || defined(OS_LINUX)
174 #define MAYBE_TestMemoryInfra DISABLED_TestMemoryInfra 175 #define MAYBE_TestMemoryInfra DISABLED_TestMemoryInfra
175 #else 176 #else
176 #define MAYBE_TestMemoryInfra TestMemoryInfra 177 #define MAYBE_TestMemoryInfra TestMemoryInfra
177 #endif 178 #endif
178 IN_PROC_BROWSER_TEST_F(SingleProcessTracingBrowserTest, MAYBE_TestMemoryInfra) { 179 IN_PROC_BROWSER_TEST_F(SingleProcessTracingBrowserTest, MAYBE_TestMemoryInfra) {
179 PerformDumpMemoryTestActions(); 180 PerformDumpMemoryTestActions();
180 } 181 }
181 182
182 } // namespace 183 } // namespace
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698