diff options
Diffstat (limited to 'content/common')
-rw-r--r-- | content/common/process_watcher_unittest.cc | 4 | ||||
-rw-r--r-- | content/common/sandbox_mac_diraccess_unittest.mm | 4 | ||||
-rw-r--r-- | content/common/sandbox_mac_unittest_helper.mm | 4 |
3 files changed, 11 insertions, 1 deletions
diff --git a/content/common/process_watcher_unittest.cc b/content/common/process_watcher_unittest.cc index 260075b..7b25500 100644 --- a/content/common/process_watcher_unittest.cc +++ b/content/common/process_watcher_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -31,6 +31,7 @@ bool IsProcessDead(base::ProcessHandle child) { TEST_F(ProcessWatcherTest, DelayedTermination) { base::ProcessHandle child_process = SpawnChild("process_watcher_test_never_die", false); + ASSERT_TRUE(child_process); ProcessWatcher::EnsureProcessTerminated(child_process); base::WaitForSingleProcess(child_process, 5000); @@ -49,6 +50,7 @@ MULTIPROCESS_TEST_MAIN(process_watcher_test_never_die) { TEST_F(ProcessWatcherTest, ImmediateTermination) { base::ProcessHandle child_process = SpawnChild("process_watcher_test_die_immediately", false); + ASSERT_TRUE(child_process); // Give it time to die. sleep(2); ProcessWatcher::EnsureProcessTerminated(child_process); diff --git a/content/common/sandbox_mac_diraccess_unittest.mm b/content/common/sandbox_mac_diraccess_unittest.mm index 8aad63b..b728c64 100644 --- a/content/common/sandbox_mac_diraccess_unittest.mm +++ b/content/common/sandbox_mac_diraccess_unittest.mm @@ -35,6 +35,10 @@ class MacDirAccessSandboxTest : public base::MultiProcessTest { setenv(kSandboxAccessPathKey, directory_to_try.c_str(), 1); base::ProcessHandle child_process = SpawnChild("mac_sandbox_path_access", false); + if (child_process == base::kNullProcessHandle) { + LOG(WARNING) << "SpawnChild failed"; + return false; + } int code = -1; if (!base::WaitForExitCode(child_process, &code)) { LOG(WARNING) << "base::WaitForExitCode failed"; diff --git a/content/common/sandbox_mac_unittest_helper.mm b/content/common/sandbox_mac_unittest_helper.mm index 564cc8b..3b0345d 100644 --- a/content/common/sandbox_mac_unittest_helper.mm +++ b/content/common/sandbox_mac_unittest_helper.mm @@ -81,6 +81,10 @@ bool MacSandboxTest::RunTestInSandbox(Sandbox::SandboxProcessType sandbox_type, base::ProcessHandle child_process = SpawnChild("mac_sandbox_test_runner", false); + if (child_process == base::kNullProcessHandle) { + LOG(WARNING) << "SpawnChild failed"; + return false; + } int code = -1; if (!base::WaitForExitCode(child_process, &code)) { LOG(WARNING) << "base::WaitForExitCode failed"; |