diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-29 21:49:22 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-29 21:49:22 +0000 |
| commit | 1e406a18706847d8ecaf5c7eeaf3f7f7a5e2fe4f (patch) | |
| tree | 3fb2d10ddb0aaf17613723c88ec91e4bdbf92752 /sandbox | |
| parent | 015de1d066902fe3b3c9cce74a61b6d234abcd00 (diff) | |
| download | chromium_src-1e406a18706847d8ecaf5c7eeaf3f7f7a5e2fe4f.zip chromium_src-1e406a18706847d8ecaf5c7eeaf3f7f7a5e2fe4f.tar.gz chromium_src-1e406a18706847d8ecaf5c7eeaf3f7f7a5e2fe4f.tar.bz2 | |
Fix sandbox_mac_unittests:BootstrapSandboxTest.ForwardMessageInProcess on 10.6.
On Snow Leopard, bootstrap_lookup2 may place the new port into a MRU cache, for
which it obtains an extra send right.
BUG=367863
R=mark@chromium.org
NOTRY=true
NOTREECHECKS=true
Review URL: https://codereview.chromium.org/301303002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273613 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox')
| -rw-r--r-- | sandbox/mac/bootstrap_sandbox_unittest.mm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sandbox/mac/bootstrap_sandbox_unittest.mm b/sandbox/mac/bootstrap_sandbox_unittest.mm index fb389237..8bfbf32 100644 --- a/sandbox/mac/bootstrap_sandbox_unittest.mm +++ b/sandbox/mac/bootstrap_sandbox_unittest.mm @@ -311,7 +311,12 @@ TEST_F(BootstrapSandboxTest, ForwardMessageInProcess) { send_rights = 0; ASSERT_EQ(KERN_SUCCESS, mach_port_get_refs(task, port, MACH_PORT_RIGHT_SEND, &send_rights)); - EXPECT_EQ(2u, send_rights); + // On 10.6, bootstrap_lookup2 may add an extra right to place it in a per- + // process cache. + if (base::mac::IsOSSnowLeopard()) + EXPECT_TRUE(send_rights == 3u || send_rights == 2u) << send_rights; + else + EXPECT_EQ(2u, send_rights); } } // namespace sandbox |