summaryrefslogtreecommitdiffstats
path: root/base/process_util_unittest.cc
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-19 17:43:00 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-19 17:43:00 +0000
commit629ed3ab57b51a42b5c27bd412f7cd61a0026716 (patch)
tree1c9dcd9f1859b9bd36816e093056633ad14fd40a /base/process_util_unittest.cc
parente0c95a96832eb50adf7c15f9c00e728bbc9e1ec7 (diff)
downloadchromium_src-629ed3ab57b51a42b5c27bd412f7cd61a0026716.zip
chromium_src-629ed3ab57b51a42b5c27bd412f7cd61a0026716.tar.gz
chromium_src-629ed3ab57b51a42b5c27bd412f7cd61a0026716.tar.bz2
Disable GetTerminationStatusExit on Windows.
Timed out here: http://build.chromium.org/p/tryserver.chromium/builders/win/builds/56264/steps/base_unittests/logs/stdio BUG=95058 TEST=none TBR=gspencer Review URL: http://codereview.chromium.org/7944001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101770 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/process_util_unittest.cc')
-rw-r--r--base/process_util_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/base/process_util_unittest.cc b/base/process_util_unittest.cc
index 4db1361..e06f3f6 100644
--- a/base/process_util_unittest.cc
+++ b/base/process_util_unittest.cc
@@ -136,8 +136,8 @@ TEST_F(ProcessUtilTest, KillSlowChild) {
remove(kSignalFileSlow);
}
-// Times out on Linux, flakes on other platforms. http://crbug.com/95058
-#if defined(OS_LINUX)
+// Times out on Linux and Win, flakes on other platforms, http://crbug.com/95058
+#if defined(OS_LINUX) || defined(OS_WIN)
#define MAYBE_GetTerminationStatusExit DISABLED_GetTerminationStatusExit
#else
#define MAYBE_GetTerminationStatusExit FLAKY_GetTerminationStatusExit