diff options
| author | bradchen@google.com <bradchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-19 01:09:14 +0000 |
|---|---|---|
| committer | bradchen@google.com <bradchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-19 01:09:14 +0000 |
| commit | b8bdc72fe8de930ec9e125306b51aa8447206414 (patch) | |
| tree | d34a7d54b2756520a9deee5ece4024fbc8fb8c93 /base/process_util_unittest.cc | |
| parent | c4eef4500c9f31aa41ea1ffb4a3af94dad1922c4 (diff) | |
| download | chromium_src-b8bdc72fe8de930ec9e125306b51aa8447206414.zip chromium_src-b8bdc72fe8de930ec9e125306b51aa8447206414.tar.gz chromium_src-b8bdc72fe8de930ec9e125306b51aa8447206414.tar.bz2 | |
Disable process_util unit test that uses clone() on valgrind bots.
BUG=
TEST=this is a test
Review URL: http://codereview.chromium.org/7409005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92936 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/process_util_unittest.cc')
| -rw-r--r-- | base/process_util_unittest.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/base/process_util_unittest.cc b/base/process_util_unittest.cc index 405beb4..09d3b50 100644 --- a/base/process_util_unittest.cc +++ b/base/process_util_unittest.cc @@ -15,6 +15,7 @@ #include "base/process_util.h" #include "base/test/multiprocess_test.h" #include "base/test/test_timeouts.h" +#include "base/third_party/dynamic_annotations/dynamic_annotations.h" #include "base/threading/platform_thread.h" #include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" @@ -566,8 +567,11 @@ TEST_F(ProcessUtilTest, LaunchProcess) { EXPECT_EQ("wibble\n", TestLaunchProcess(env_changes, no_clone_flags)); #if defined(OS_LINUX) - // test a non-trival value for clone_flags - EXPECT_EQ("wibble\n", TestLaunchProcess(env_changes, CLONE_FS | SIGCHLD)); + // Test a non-trival value for clone_flags. + // Don't test on Valgrind as it has limited support for clone(). + if (!RunningOnValgrind()) { + EXPECT_EQ("wibble\n", TestLaunchProcess(env_changes, CLONE_FS | SIGCHLD)); + } #endif } |