summaryrefslogtreecommitdiffstats
path: root/base/debug
diff options
context:
space:
mode:
authorstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-28 17:14:49 +0000
committerstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-28 17:14:49 +0000
commitcc3a5ffbb84b682f2f01ff48f95124feda306c58 (patch)
treee36071c08a7fa1851cd15122ccc2a7155892a421 /base/debug
parente215b1d74a767e0580e4f338c9e108637eb74870 (diff)
downloadchromium_src-cc3a5ffbb84b682f2f01ff48f95124feda306c58.zip
chromium_src-cc3a5ffbb84b682f2f01ff48f95124feda306c58.tar.gz
chromium_src-cc3a5ffbb84b682f2f01ff48f95124feda306c58.tar.bz2
Update a bunch of FLAKY_ tests to match current reality
Mostly this is removing FLAKY_ where the bug was fixed but the label never removed, but also switches some FLAKY_ to platform-specific FAILS_. BUG=28372,32048,32070,35341,45561,48544,48562,52858 TEST=N/A Review URL: http://codereview.chromium.org/4087009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64264 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/debug')
-rw-r--r--base/debug/stack_trace_unittest.cc9
1 files changed, 7 insertions, 2 deletions
diff --git a/base/debug/stack_trace_unittest.cc b/base/debug/stack_trace_unittest.cc
index e8e1e19..ce5f313 100644
--- a/base/debug/stack_trace_unittest.cc
+++ b/base/debug/stack_trace_unittest.cc
@@ -14,8 +14,13 @@ namespace debug {
// Note: On Linux, this test currently only fully works on Debug builds.
// See comments in the #ifdef soup if you intend to change this.
-// Flaky, crbug.com/32070.
-TEST(StackTrace, FLAKY_OutputToStream) {
+#if defined(OS_WIN)
+// Always fails on Windows: crbug.com/32070
+#define MAYBE_OutputToStream FAILS_OutputToStream
+#else
+#define MAYBE_OutputToStream OutputToStream
+#endif
+TEST(StackTrace, MAYBE_OutputToStream) {
StackTrace trace;
// Dump the trace into a string.